Merge branch release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 7 Feb 2017 13:27:05 +0000 (14:27 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Tue, 7 Feb 2017 16:11:12 +0000 (17:11 +0100)
commitf8ea0d9b568d94d1b6984478227ac15f738e7252
tree0274226e0b2ff0218021cd5c61f32cf986749587
parentd1950dc6d7bfb0b067cdac3608958ae13b5f52ac
parenta26ba934d1012e94600fb2448db0f0f267a1565d
Merge branch release-2016

Minor clashes mostly from nullptr and logger introduction in master
branch. Resolved all in favour of release-2016 logic implemented with
in master-branch functionality.

Change-Id: Ic30ce3b3aadaab6e74f6d9606ca00fb275a6ccb3
14 files changed:
cmake/gmxVersionInfo.cmake
docs/CMakeLists.txt
src/gromacs/gmxana/gmx_order.cpp
src/gromacs/gmxana/gmx_rmsf.cpp
src/gromacs/gmxpreprocess/grompp.cpp
src/gromacs/gmxpreprocess/insert-molecules.cpp
src/gromacs/gmxpreprocess/solvate.cpp
src/gromacs/gmxpreprocess/toppush.cpp
src/gromacs/mdlib/md_support.cpp
src/gromacs/mdlib/md_support.h
src/gromacs/mdlib/sim_util.cpp
src/gromacs/timing/walltime_accounting.cpp
src/gromacs/utility/arrayref.h
src/programs/mdrun/md.cpp