Merge branch 'release-2018'
authorAleksei Iupinov <a.yupinov@gmail.com>
Tue, 27 Feb 2018 13:08:17 +0000 (14:08 +0100)
committerAleksei Iupinov <a.yupinov@gmail.com>
Tue, 27 Feb 2018 14:05:53 +0000 (15:05 +0100)
commit4cac188a75e6c242bd627784d1a1c50a1a176343
tree1a104a92a9947ba798a3273d358fa83997ef2c4a
parent0aec206f737adf7b50f1637a0085c6da53fc491c
parent8223d564e68f1ff32985d51c43f2764f18207485
Merge branch 'release-2018'

Conflict: multisim barrier handling in src/programs/mdrun/runner.cpp

Amended the test introduced in I16a3705a0d59a to exclude the implicit
solvent output which was disabled in Ib241555ff3d8e60.

Change-Id: Idf382c9c7ba92439097fcc9008cb9cc813daaab7
docs/CMakeLists.txt
src/gromacs/gmxpreprocess/tests/readir.cpp
src/gromacs/gmxpreprocess/tests/refdata/GetIrTest_DefineHandlesAssignmentOnRhs.xml
src/gromacs/mdlib/update.cpp
src/programs/mdrun/runner.cpp