Mercurial > hg > ConflictEditor
graph
-
add a siteMon, 10 Oct 2011 02:56:36 +0200, by Dirk Olmes
-
remove commented stuffSun, 09 Oct 2011 08:15:37 +0200, by Dirk Olmes
-
add a module that generates a webstart packageSun, 09 Oct 2011 08:15:11 +0200, by Dirk Olmes
-
add a toplevel pom, make this a reactor buildSun, 09 Oct 2011 07:29:59 +0200, by Dirk Olmes
-
add a comment why we discard the index hereFri, 07 Oct 2011 05:59:38 +0200, by dirk
-
replace the text field for the db url with a combo box that is populated from the preferences.Fri, 07 Oct 2011 03:58:41 +0200, by dirk
-
remove the selected conflict after saving - does not fully work yet, e.g. does not proplerly reset the differences tableTue, 20 Sep 2011 17:47:59 +0200, by dirk
-
do not blindly cast to Component ... the source of the event may be some arbitrary object (e.g. a model)Tue, 20 Sep 2011 17:21:03 +0200, by dirk
-
Implement HttpAccess using Apache's HTTP components. This works much better in conjunction with UTF-8 encoded JSONTue, 20 Sep 2011 17:00:45 +0200, by dirk
-
as per Jackson recommendation, don't use Reader objects but instead use just plain input streamTue, 20 Sep 2011 16:18:42 +0200, by dirk
-
implement resolving the conflictSun, 18 Sep 2011 19:06:59 +0200, by dirk
-
fix a bug with selection in the differences tableSun, 18 Sep 2011 11:28:20 +0200, by dirk