log mainwindow.h @ 33:ff8d64625aa3

age author description
Sat, 19 Jun 2010 00:23:09 +0300 Jari Korhonen Added retry_merge. Fixed bug in "after merge" commit.