Merge branch 'master' into history
authorAndy Allan <andy@gravitystorm.co.uk>
Wed, 22 Jun 2011 15:50:34 +0000 (16:50 +0100)
committerAndy Allan <andy@gravitystorm.co.uk>
Wed, 22 Jun 2011 15:50:34 +0000 (16:50 +0100)
commitf478d8505372152b475201b0a01e2feff42b8227
tree234e409d46bd164c391e0591aa7055dab2d4577a
parent7158279c255ac02d9800aca5ffe2ed103c37496e
parentaa899caa24693653fcc338ec2887430556387fab
Merge branch 'master' into history

Conflicts:
TODO.txt
net/systemeD/halcyon/connection/Changeset.as
net/systemeD/halcyon/connection/Connection.as
net/systemeD/halcyon/connection/Entity.as
net/systemeD/halcyon/connection/EntityCollection.as
net/systemeD/halcyon/connection/Marker.as
net/systemeD/halcyon/connection/Node.as
net/systemeD/halcyon/connection/Relation.as
net/systemeD/halcyon/connection/Way.as
net/systemeD/halcyon/connection/XMLBaseConnection.as
net/systemeD/potlatch2/TagViewer.mxml
net/systemeD/potlatch2/controller/ControllerState.as
13 files changed:
TODO.txt
net/systemeD/halcyon/connection/Changeset.as
net/systemeD/halcyon/connection/Connection.as
net/systemeD/halcyon/connection/Entity.as
net/systemeD/halcyon/connection/EntityCollection.as
net/systemeD/halcyon/connection/Marker.as
net/systemeD/halcyon/connection/Node.as
net/systemeD/halcyon/connection/Relation.as
net/systemeD/halcyon/connection/Way.as
net/systemeD/halcyon/connection/XMLBaseConnection.as
net/systemeD/halcyon/connection/XMLConnection.as
net/systemeD/potlatch2/TagViewer.mxml
net/systemeD/potlatch2/controller/ControllerState.as