Changeset c8165c for src/Actions/GlobalListOfActions.hpp

Timestamp:

May 8, 2017, 2:01:48 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_goodresults, ForceAnnealing_tocheck

Children:

db0833

Parents:

73faf4 (diff), c1446cd (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 'Docu_Python_wait' into Candidate_v1.6.1

Conflicts:

tests/Python/AllActions/options.dat

• two options introduced at same place, both get in.

File:

• src/Actions/GlobalListOfActions.hpp (modified) (1 diff)

src/Actions/GlobalListOfActions.hpp

@@ -88 +88 @@
   (MoleculeLoad) \
   (MoleculeRemove) \
+  (MoleculeRotateAroundBond) \
   (MoleculeRotateAroundSelfByAngle) \
   (MoleculeRotateToPrincipalAxisSystem) \