Timestamp:
Jul 23, 2009, 11:46:57 AM (16 years ago)
Author:
Frederik Heber <heber@…>
Children:
560995
Parents:
59a745 (diff), 2bfaf8 (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 branch 'ConstrainedMolecularDynamics'

Conflicts:

molecuilder/src/molecules.cpp

  • conflict was just regarding empty lines with some superfluous spaces
(No files)

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