Merge remote-tracking branch 'richardf/flex4' into flex4
authorAndy Allan <andy@gravitystorm.co.uk>
Fri, 30 Sep 2011 16:35:35 +0000 (17:35 +0100)
committerAndy Allan <andy@gravitystorm.co.uk>
Fri, 30 Sep 2011 16:35:35 +0000 (17:35 +0100)
commit1a8fc2e7d47acdae4676c684944f11483772db55
tree512c1742669490c83e80609ecfc2d746321010b3
parent7141f15540e05b3e9bbd55352f38eafd8cf420b0
parent5b211c223ca6bda87465748f91302d67ab669c7b
Merge remote-tracking branch 'richardf/flex4' into flex4

Conflicts:
resources/imagery.xml
resources/imagery.xml
resources/map_features.xml
resources/map_features/paths.xml