Merge release-2016 into master
authorRoland Schulz <roland.schulz@intel.com>
Sat, 23 Jul 2016 00:06:56 +0000 (17:06 -0700)
committerRoland Schulz <roland.schulz@intel.com>
Sat, 23 Jul 2016 00:06:56 +0000 (17:06 -0700)
commit2803ed39adb6ac17f87e04012d316268cfeb2cca
treef189dcb59a22d6f2e41942aeab6858dfd026847d
parentd96ddb0e6ddadd9a486b97fa581193b04762de39
parent7f2e942dd8620be03aff8f058a007c06ac301bac
Merge release-2016 into master

Conflicts:
src/programs/mdrun/resource-division.cpp
src/programs/mdrun/resource-division.h
src/programs/mdrun/runner.cpp

Change-Id: I02a0af8295df0fa271e6e236daf035ea442cb73a
src/gromacs/fileio/enxio.cpp
src/gromacs/tools/dump.cpp
src/gromacs/trajectory/trajectoryframe.h
src/programs/mdrun/resource-division.cpp
src/programs/mdrun/resource-division.h
src/programs/mdrun/runner.cpp