Timestamp:
Apr 1, 2010, 12:16:29 PM (16 years ago)
Author:
Saskia Metzler <metzler@…>
Children:
d3513b
Parents:
2704e2 (diff), 770138 (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:

Merge Till's structure refactoring

Merge commit 'till/StructureRefactoring' into StateAndFormatParser

Conflicts:

molecuilder/src/Makefile.am
molecuilder/src/unittests/Makefile.am

(No files)

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