should override each other, but currently they are mixed upon rendering.
Does it matter?
- Fixing of label positions should include some margin
-- _BRUM_XXX_H -> _LEO_XXX_H
+- Clean up shp.c
-- Interesting tags:
-amenity = kindergarten
-bridge = yes
-historic = archaeological_site
-place = islet
-railway = crossing
-railway = level_crossing
-tunnel = culvert
-tunnel = yes
+* Merge changes from poskole2015 branch (waits for merge of automatic labelling):
-=== Opravit v OSM ===
+ - icon-offset-{x,y} (commit c766658cd89232da2238aceeebcd4b3cc1b1a8c8)
+ - (major-)z-index-fixup (commit 65930752a89084c4f17440a9fdc5548801134638)
+ - casing-z-index (commit 65ad3116fc4ff85fdf8c2945f37d1d97cfe86c34)
-* RozliĆĄovat kostely a kaple
+* Merge of labelling
+
+ - fix order of includes
+
+* Lua bindings
+
+ - setting of properties to nil should remove them
+ - more types (e.g., colors)
+ - prolog
+ - expressions returning a value
+ - document somewhere