diff options
| author | Antoine Beaupré <anarcat@koumbit.org> | 2013-11-29 01:30:24 -0500 |
|---|---|---|
| committer | Antoine Beaupré <anarcat@koumbit.org> | 2013-11-29 01:30:29 -0500 |
| commit | cda64f643ebb1332da969885e4020cda9aeb2c83 (patch) | |
| tree | 718f7bcbb80ca712d56ac4c2ef86859015094bd6 /doc/todo | |
| parent | 4757ee1ab77b1b5d9c2aceb88b152705bad224e0 (diff) | |
| download | ikiwiki-cda64f643ebb1332da969885e4020cda9aeb2c83.tar ikiwiki-cda64f643ebb1332da969885e4020cda9aeb2c83.tar.gz | |
i rebased all my branches to the latest release and renamed some branches, 2 bugs still await merging to be fixed
Diffstat (limited to 'doc/todo')
| -rw-r--r-- | doc/todo/osm__95__optimisations__95__and__95__fixes.mdwn | 4 |
1 files changed, 2 insertions, 2 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 fa74d3126..3496cff68 100644 --- 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]]. |