Parametrized drawing of map scale

[leo.git] / TODO

diff --git a/TODO b/TODO
index 925cf329d37f17e2b71945188882ea6b5e130353..98be6bbce8c9a451f953dd99bfd73345baccaa5e 100644 (file)
--- a/TODO
+++ b/TODO
@@ -3,4 +3,10 @@
   should override each other, but currently they are mixed upon rendering.
   Does it matter?
 - Fixing of label positions should include some margin
-- Clean up Makefile
+- Clean up shp.c
+
+* Merge changes from poskole2015 branch (waits for merge of automatic labelling):
+
+  - icon-offset-{x,y} (commit c766658cd89232da2238aceeebcd4b3cc1b1a8c8)
+  - (major-)z-index-fixup (commit 65930752a89084c4f17440a9fdc5548801134638)
+  - casing-z-index (commit 65ad3116fc4ff85fdf8c2945f37d1d97cfe86c34)