log mainwindow.cpp @ 318:124a3ea9fafb easyhg_v0.4

age author description
Wed, 02 Mar 2011 12:38:17 +0000 Chris Cannam Merge, and add a helpful warning when you try to push before committing your merge (I just did this and the ensuing warning was misleading) easyhg_v0.4
Tue, 01 Mar 2011 15:51:28 +0000 Chris Cannam Update version number to 0.4; another minor textual fix