TODO: Remember to merge various hacks from poskole2015

diff --git a/TODO b/TODO
index 2977c8326286cc47bf302a580f8c76ff0b21140e..98be6bbce8c9a451f953dd99bfd73345baccaa5e 100644 (file)
--- a/TODO
+++ b/TODO
@@ -4,3 +4,9 @@
   Does it matter?
 - Fixing of label positions should include some margin
 - 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)