Merge remote-tracking branch 'stevage/repeat-relations-3596' into repeatrelations
authorRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 18:32:35 +0000 (19:32 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 18:32:35 +0000 (19:32 +0100)
1  2 
net/systemeD/halcyon/connection/Relation.as
net/systemeD/potlatch2/controller/ControllerState.as
net/systemeD/potlatch2/controller/DrawWay.as

index 048f1228bbcb47a82b48e95a722bf10a8f84885b,c3e4e45fa8d3df36ec6f2bfff02a9ca0f23f8a26..d8e7d316d4e0a80e1658e6f799744fe0a12531a5
@@@ -4,12 -4,11 +4,13 @@@ package net.systemeD.potlatch2.controll
      import net.systemeD.halcyon.Map;
      import net.systemeD.halcyon.MapPaint;
      import net.systemeD.halcyon.connection.*;
 +    import net.systemeD.halcyon.AttentionEvent;
      import net.systemeD.potlatch2.collections.Imagery;
      import net.systemeD.potlatch2.EditController;
 +    import net.systemeD.potlatch2.history.HistoryDialog;
        import net.systemeD.potlatch2.save.SaveManager;
        import net.systemeD.potlatch2.utils.SnapshotConnection;
+     import net.systemeD.halcyon.AttentionEvent;
        import flash.ui.Keyboard;
        import mx.controls.Alert;
        import mx.events.CloseEvent;