Merge release-2018 into master
authorRoland Schulz <roland.schulz@intel.com>
Fri, 12 Jan 2018 01:58:30 +0000 (17:58 -0800)
committerMark Abraham <mark.j.abraham@gmail.com>
Tue, 16 Jan 2018 14:45:52 +0000 (15:45 +0100)
commit51052df810f16813149e6102046a84a547a796e8
treeefac1c5f5f79c2dfaadf81baeb80972b12409c2d
parentb61de38b103d6e72189e566bec5d1a13ce48c766
parent6573773322dcb7fd28dfbb370ab7f7939d4223be
Merge release-2018 into master

Change-Id: I197f817d0b54392bc1198536e39e74baacad3e96
cmake/gmxCPackUtilities.cmake
src/programs/mdrun/runner.cpp