Manual merge of merge request 95 from Hooray
authorStuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Sat, 3 Nov 2012 22:05:37 +0000 (22:05 +0000)
committerStuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Sat, 3 Nov 2012 22:06:51 +0000 (22:06 +0000)
commit9e3a854bf573dfeeef2ef12801ab8edb55772e06
treebdc812d50a9360e004ebc46605d6bfc82f421732
parent8a08766f033aa71edda211d1fee7caa65a7355f4
Manual merge of merge request 95 from Hooray
Nasal/canvas/generic-canvas-map.xml
Nasal/canvas/map.nas
gui/dialogs/airports.xml