Timestamp:
Mar 4, 2010, 9:49:45 AM (16 years ago)
Author:
Saskia Metzler <metzler@…>
Children:
f2efcf
Parents:
eb94c1 (diff), 3746aeb (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 commit 'till/StructureRefactoring' into StateAndFormatParser

Conflicts:

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

SOURCE and HEADER are both one long line and thus could not be merged automatically.

(No files)

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