comparison filestates.h @ 362:73fb5ef55744

Merge from branch "feature_91b". Really fixes #91
author Chris Cannam
date Thu, 17 Mar 2011 17:34:40 +0000
parents 4cd753e083cc
children
comparison
equal deleted inserted replaced
360:f34848e8094b 362:73fb5ef55744
60 Annotate, 60 Annotate,
61 61
62 Commit, 62 Commit,
63 Revert, 63 Revert,
64 64
65 Rename,
66 Copy,
67
65 Add, 68 Add,
66 Remove, 69 Remove,
67 70
68 RedoMerge, 71 RedoMerge,
69 MarkResolved, 72 MarkResolved,