diff mainwindow.cpp @ 272:256138a4ed0e

* Add easyhg-merge.bat and use it. (This isn't necessary if hg has been properly configured, as the Tortoise distribution has)
author Chris Cannam
date Tue, 25 Jan 2011 16:12:23 +0000
parents 8730dd806cca
children cc95394e2392
line wrap: on
line diff