ConflictEditor: revision graph

graph

less more | rev 11: (0) -10 -2 +2 +10 +30 tip

switch to GridBagLayout
Tue, 13 Sep 2011 03:29:11 +0200, by Dirk Olmes
clean up: ConflictEditor should only contain code that mediates between the various GUI elements. The logic for dealing with conflicts moves to ConflictEditorController.
Tue, 13 Sep 2011 02:33:01 +0200, by Dirk Olmes

less more | rev 11: (0) -10 -2 +2 +10 +30 tip