Author: ericwa
Date: Wed Oct 23 00:57:49 2013
New Revision: 9392
URL: http://svn.gna.org/viewcvs/etoile?rev=9392&view=rev
Log:
Move some dead code to Scraps (merging related)
Added:
trunk/Etoile/Frameworks/CoreObject/Scraps/find_sequence_conflicts.m
Removed:
trunk/Etoile/Frameworks/CoreObject/Diff/COSequenceMerge.h
trunk/Etoile/Frameworks/CoreObject/Diff/COSequenceMerge.m
Modified:
trunk/Etoile/Frameworks/CoreObject/CoreObject.xcodeproj/project.pbxproj
trunk/Etoile/Frameworks/CoreObject/Diff/COArrayDiff.m
trunk/Etoile/Frameworks/CoreObject/Diff/COItemGraphEdit.m
trunk/Etoile/Frameworks/CoreObject/Diff/COSequenceEdit.m
_______________________________________________
Etoile-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/etoile-cvs