diff mainwindow.h @ 294:fc9d411ff6e7

Fix some breakages from prior merge commit (oops); make merge result use more-information dialog
author Chris Cannam
date Mon, 21 Feb 2011 18:20:29 +0000
parents 7b4f42cfc596
children d40294e164da
line wrap: on
line diff