log

age author description
Sun, 18 Sep 2011 19:06:59 +0200 dirk implement resolving the conflict
Sun, 18 Sep 2011 11:28:20 +0200 dirk fix a bug with selection in the differences table