Merge branch 'master' into add-keywords

This commit is contained in:
Joakim Hove
2013-10-09 08:07:37 +02:00
+2 -2
View File
@@ -1,3 +1,3 @@
{"name" : "GRIDUNIT" , "size" : 1, "items" :
[{"name" : "LengthUnit" , "value_type" : "STRING" , "default" : "METRES"}]
}
[{"name" : "LengthUnit" , "value_type" : "STRING" , "default" : "METRES"},
{"name" : "MAP" , "value_type" : "STRING"}]}