Merge branch 'master' into flex4
authorAndy Allan <andy@gravitystorm.co.uk>
Fri, 30 Sep 2011 16:14:23 +0000 (17:14 +0100)
committerAndy Allan <andy@gravitystorm.co.uk>
Fri, 30 Sep 2011 16:14:23 +0000 (17:14 +0100)
commitf6409b7f2a3ab08c9059b6f57237ecea067df3ef
treeb54dc556d342710208bdd66307dfa7dfc1634668
parent929ca20eb3ca352cdeab3ae7eda91f47901b8709
parenta7cff2ec6cdf243ae0dc395d26dc329ccb707651
Merge branch 'master' into flex4

Conflicts:
net/systemeD/halcyon/connection/Connection.as
net/systemeD/potlatch2/find/FindDialog.mxml
potlatch2.mxml
resources/map_features/amenities.xml
resources/map_features/barriers.xml
resources/map_features/landuse.xml
resources/map_features/paths.xml
resources/map_features/transport.xml
build.xml
net/systemeD/halcyon/connection/Connection.as
net/systemeD/potlatch2/find/FindDialog.mxml
potlatch2.mxml
resources/map_features.xml
resources/map_features/amenities.xml
resources/map_features/barriers.xml
resources/map_features/landuse.xml
resources/map_features/paths.xml
resources/map_features/transport.xml