| commit | cae513cd275189b0adb2b4a0e4901893c761cfca | |
| author | Mark Abraham <mark.j.abraham@gmail.com> | |
| Sun, 24 Jan 2016 13:07:30 +0000 (24 14:07 +0100) | ||
| committer | Mark Abraham <mark.j.abraham@gmail.com> | |
| Mon, 25 Jan 2016 06:08:04 +0000 (25 07:08 +0100) | ||
| tree | 1bdf684cb25566fc8ebe11a25beb73b18acd4999 | treesnapshot (tar.gz zip) |
| parent | 9a56989540ba0c3711fad96945aa59f1be3c34e7 | commitdiff |
| parent | 302c09c50c4669538c32b7e3b9bb22e52606955d | commitdiff |
Merge branch release-5-1
Several minor clashes in md.cpp from refactoring in master branch;
specifically the removal of CGLO_RERUN (adjacent to changes in
release-5-1), rename of bStateFromCP to startingFromCheckpoint, change
IR_NVT_TROTTER(ir) to inputrecNvtTrotter(ir), removal of bCompact.
Change-Id: I42740bb6c67684f81bc305703240df4d5977bdab
Several minor clashes in md.cpp from refactoring in master branch;
specifically the removal of CGLO_RERUN (adjacent to changes in
release-5-1), rename of bStateFromCP to startingFromCheckpoint, change
IR_NVT_TROTTER(ir) to inputrecNvtTrotter(ir), removal of bCompact.
Change-Id: I42740bb6c67684f81bc305703240df4d5977bdab
| docs/install-guide/index.rst | diff1 | diff2 | blobhistory |
| src/programs/mdrun/md.cpp | diff1 | diff2 | blobhistory |