diff src/main.cpp @ 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 533519ebc0cb
children 0e0844310914
line wrap: on
line diff