diff uncommitteditem.h @ 159:087d7cdde662

* Add InConflict state (not yet used)
author Chris Cannam
date Fri, 03 Dec 2010 12:29:57 +0000
parents 70fe12873106
children 4bad3c5c053a
line wrap: on
line diff