Changeset 47548d for molecuilder/src/ellipsoid.cpp

Timestamp:

Jul 23, 2009, 2:04:47 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

c3a303

Parents:

f39735 (diff), 1f6efb (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 'AtomRemoval'

Conflicts:

molecuilder/src/builder.cpp
molecuilder/src/molecules.cpp

merges:

• builder.cpp: case 'R' in ParseCommandLineOptions from AtomRemoval, also bugfix in RemoveAtoms(), rest from HEAD
• molecules.cpp: Basically all from HEAD because of MultipleMolecules and ConstrainedMD

(No files)