Merge branch 'master' of ssh://git.ikiwiki.info

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 002b2a22c5956d0c766870b3c35674b468b38a5e..fa74d31264165135b3bcd81ac22bfb99aea54ce4 100644 (file)
--- a/doc/todo/osm__95__optimisations__95__and__95__fixes.mdwn
+++ b/doc/todo/osm__95__optimisations__95__and__95__fixes.mdwn
@@ -12,6 +12,8 @@ I have two main branches that need merging (on top of [[todo/osm_arbitrary_layer
 
 > > Good point. Maybe that can be skipped for now, it sure doesn't look like it will be merged any time soon anyways. I do think that the optimisation needs to be merged, it's quite important because if halves the size of the resulting KML file. --[[anarcat]]
 
+> > > The merge you just did is fine, the only thing missing is folder support, I'll keep it in a separate branch for now, maybe it will be useful later! This is [[done]]. --[[anarcat]]
+
  * `osm_openlayers_misc` - do not override the sorting of layers (so that the order defined in [[todo/osm_arbitrary_layers]] takes effect) and tell Emacs about the non-default indentation policies of the file.
 
 > I prefer not to pollute files with editor-specific garbage, and that goes

diff --git a/doc/todo/osm_arbitrary_layers.mdwn b/doc/todo/osm_arbitrary_layers.mdwn
index 4e579b54a24b4d74dda5a0217abb7b223aec457b..d59f394ee82a21fe55c565423cdb4e90458bd724 100644 (file)
--- a/doc/todo/osm_arbitrary_layers.mdwn
+++ b/doc/todo/osm_arbitrary_layers.mdwn
@@ -39,3 +39,5 @@ I got tired of hacking at the osm.pm every time I wanted to change the layers, s
 >>>>> I have implemented 1.b) and 2. (ie. it's a simple array now, and I split this stuff in different branches.) I'll open another todo for the other branches. --[[anarcat]]
 
 >>>>>> [[merged|done]] --[[Joey]] 
+
+Confirmed, thanks!! --[[anarcat]]