Merge branch 'master' into history
authorAndy Allan <andy@gravitystorm.co.uk>
Fri, 30 Sep 2011 18:12:27 +0000 (19:12 +0100)
committerAndy Allan <andy@gravitystorm.co.uk>
Fri, 30 Sep 2011 18:12:27 +0000 (19:12 +0100)
1  2 
net/systemeD/halcyon/connection/Connection.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

index 08b80335d062f3c303c2b762f22485aa14992de8,b2b62fddee728583b8892c2b697e272a20ee7fee..94b762813a778ffbb7a302d4ae5b2b3b43b622cb
        import net.systemeD.halcyon.connection.*;
        import net.systemeD.halcyon.MapPaint;
        import net.systemeD.potlatch2.mapfeatures.*;
 +      import net.systemeD.potlatch2.history.HistoryDialog;
        import net.systemeD.potlatch2.utils.*;
+       import net.systemeD.controls.CollapsiblePanel;
  
        import mx.collections.*;
        import mx.containers.*;