Merge remote-tracking branch 'gravitystorm/mygpx'
authorRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 15:32:41 +0000 (16:32 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 15:32:41 +0000 (16:32 +0100)
commit5af2ff73a0f043a7bb9625ea868fb8cf74f63641
tree99c30628d56a2beafd00fec36e32d6fb43b2978d
parent48b50510649d81fee1800f4b0b5eaacec949b501
parent130779d3c8e44d6267af8169439fdafd59db26e0
Merge remote-tracking branch 'gravitystorm/mygpx'
net/systemeD/halcyon/connection/XMLConnection.as
net/systemeD/potlatch2/dialogs/MyGpxDialog.mxml