i rebased all my branches to the latest release and renamed some branches, 2 bugs...

[ikiwiki.git] / doc / todo / osm__95__optimisations__95__and__95__fixes.mdwn

diff --git a/doc/todo/osm__95__optimisations__95__and__95__fixes.mdwn b/doc/todo/osm__95__optimisations__95__and__95__fixes.mdwn
index fa74d31264165135b3bcd81ac22bfb99aea54ce4..3496cff68d936f619490fe2838ad685bba9b0223 100644 (file)
--- a/doc/todo/osm__95__optimisations__95__and__95__fixes.mdwn
+++ b/doc/todo/osm__95__optimisations__95__and__95__fixes.mdwn
@@ -1,5 +1,5 @@
 [[!template  id=gitbranch branch=anarcat/osm_kml_formatting author="[[anarcat]]"]]
-[[!template  id=gitbranch branch=anarcat/osm_openlayers_misc author="[[anarcat]]"]]
+[[!template  id=gitbranch branch=anarcat/attic/osm_emacs_indent author="[[anarcat]]"]]
 
 I have accumulated a small series of patches to the OSM plugin along with the [[other|todo/osm_arbitrary_layers]] [[fixes|bugs/osm_KML_maps_do_not_display_properly_on_google_maps]] I have submitted here. They have lived in a tangled mess on my master branch so far, but not anymore!
 
@@ -20,7 +20,7 @@ I have two main branches that need merging (on top of [[todo/osm_arbitrary_layer
 > doubly for files served over the network. Cherry-picked the layer sorting
 > change. --[[Joey]]
 
-> > Alright, I am fine with that, thanks. -- [[anarcat]]
+> > Alright, I am fine with that, thanks. I moved my branch to the attic. -- [[anarcat]]
 
 Those two branches are also merged directly on my master branch... along with [[todo/osm_arbitrary_layers]].