diff incomingdialog.cpp @ 159:087d7cdde662

* Add InConflict state (not yet used)
author Chris Cannam
date Fri, 03 Dec 2010 12:29:57 +0000
parents 63c2f3f61c79
children 8fd71f570884
line wrap: on
line diff