Author: theraven Date: Thu Jan 21 22:02:26 2010 New Revision: 5855 URL: http://svn.gna.org/viewcvs/etoile?rev=5855&view=rev Log: Tidied up merging so results are combined in a vaguely intelligent way and new bindings can replace old ones.
Modified:
branches/guenther/ObjMeta/OMTest.tool/Resources/OMGrammar.st
branches/guenther/ObjMeta/OMTest.tool/Resources/OMTest.st
_______________________________________________
Etoile-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/etoile-cvs
