diff src/mainwindow.h @ 603:10ef94e51f44

Make sure we update the view after a failed merge
author Chris Cannam
date Tue, 03 Jul 2012 10:08:44 +0100
parents 39cac58b4f92
children 38c84c66ad7a
line wrap: on
line diff