log mainwindow.cpp @ 237:c9a7e4ec2f78

age author description
Mon, 10 Jan 2011 12:44:03 +0000 Chris Cannam * Try to do the right thing when completely reverting a merge (forget that the merge took place)