]> git.street.me.uk Git - andy/viking.git/commit
Merge branch 'Geotagging'
authorRob Norris <rw_norris@hotmail.com>
Mon, 19 Dec 2011 22:15:02 +0000 (22:15 +0000)
committerRob Norris <rw_norris@hotmail.com>
Mon, 19 Dec 2011 22:15:02 +0000 (22:15 +0000)
commit1406f28d8811c6ff93337f1fb52f261cd0a11cb9
treeafc97bc924df44c7da3948eff428557212852205
parentc67fc2cb89f78a3eaefbe085468350365b1e77f3
parent404328d14995f5ff6721486cf8ff4539b957aec9
Merge branch 'Geotagging'

Conflicts:
src/file.c

Resolve KML units setting with babel function parameter ordering from commits:
60dbd0ad7333bcc0502106e003ce321dfbf75ea2 + 9181183a2880930d694fddef2582c75ffffa3d53
src/file.c
src/viktrwlayer.c