diff options
| author | Joey Hess <joey@kitenet.net> | 2012-08-25 10:56:30 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-25 10:56:30 -0400 |
| commit | 4ef13d9856d0d61d87afadcfd7ec20d4e0cb646c (patch) | |
| tree | 0356d73eaa506564ec536f12cda31b2fb95a817b /doc | |
| parent | b5a7e156d1bec925ca149fd9a85f4521fa9b1111 (diff) | |
| parent | 72cde6d41923f0a43dba6b227d5efbfd4e2f600d (diff) | |
| download | ikiwiki-4ef13d9856d0d61d87afadcfd7ec20d4e0cb646c.tar ikiwiki-4ef13d9856d0d61d87afadcfd7ec20d4e0cb646c.tar.gz | |
Merge branch 'master' of ssh://git.ikiwiki.info
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/todo/osm__95__optimisations__95__and__95__fixes.mdwn | 2 | ||||
| -rw-r--r-- | doc/todo/osm_arbitrary_layers.mdwn | 2 |
2 files changed, 4 insertions, 0 deletions
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 002b2a22c..fa74d3126 100644 --- 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 4e579b54a..d59f394ee 100644 --- 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]] |