From: Martin Mares <mj@ucw.cz>
Date: Sun, 7 Jun 2015 13:19:58 +0000 (+0200)
Subject: TODO: Remember to merge various hacks from poskole2015
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=8072028abf28ef6fd8662cc80b5af44a33a3eeda;p=leo.git

TODO: Remember to merge various hacks from poskole2015
---

diff --git a/TODO b/TODO
index 2977c83..98be6bb 100644
--- 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)