diff filestates.h @ 108:8ae3b44c0073

* Enable/disable update and merge actions depending on whether default update and merge will actually do anything
author Chris Cannam
date Thu, 25 Nov 2010 21:08:17 +0000
parents 44ed7766d55a
children 087d7cdde662
line wrap: on
line diff