log filestates.cpp @ 199:f16fe0db11f3

age author description
Mon, 03 Jan 2011 22:02:08 +0000 Chris Cannam * Add "Show All Files" toggle to show ignored and clean files
Fri, 03 Dec 2010 19:35:04 +0000 Chris Cannam * First cut of work on merge/resolve logic
Fri, 03 Dec 2010 12:29:57 +0000 Chris Cannam * Add InConflict state (not yet used)