Timestamp:
Mar 5, 2010, 1:45:35 PM (16 years ago)
Author:
Saskia Metzler <metzler@…>
Children:
2704e2
Parents:
5aefaa (diff), 025ca2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

solve merge conflict

Merge commit 'till/StructureRefactoring' into StateAndFormatParser

Conflicts:

molecuilder/src/unittests/Makefile.am

(No files)

Note: See TracChangeset for help on using the changeset viewer.