biod.pnpi.spb.ru / alexxy / gromacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9a56989 302c09c)
Merge branch release-5-1
authorMark Abraham <mark.j.abraham@gmail.com>
Sun, 24 Jan 2016 13:07:30 +0000 (14:07 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Mon, 25 Jan 2016 06:08:04 +0000 (07:08 +0100)
commitcae513cd275189b0adb2b4a0e4901893c761cfca
tree1bdf684cb25566fc8ebe11a25beb73b18acd4999tree | snapshot
parent9a56989540ba0c3711fad96945aa59f1be3c34e7commit | diff
parent302c09c50c4669538c32b7e3b9bb22e52606955dcommit | diff
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
docs/install-guide/index.rst diff1 | diff2 | blob | history
src/programs/mdrun/md.cpp diff1 | diff2 | blob | history
Local GROMACS mirror with custom stuff