Merge branch release-5-1 into master
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 14 Aug 2015 15:14:37 +0000 (17:14 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Fri, 14 Aug 2015 15:15:44 +0000 (17:15 +0200)
commit9179c809ad2aca380824a469b598e9f6bdca0c13
tree19d49168c039817f82725e5d6c04fc10ee410467
parentc9a2a820450aef737916976e17cbe0820467f51b
parent5880df1d4ddc4c1379668d210d7c90cd43bbb152
Merge branch release-5-1 into master

Conflicts:
cmake/gmxVersionInfo.cmake
Master keeps its version numbers
        src/gromacs/gmxlib/gmx_thread_affinity.cpp
Preserved correct use of HAVE_SCHED_AFFINITY, along with
the changed scope of variables in master branch.

Change-Id: Iea61bb5baef89fa39125ae9785dcdc750690cd45
cmake/gmxCFlags.cmake
cmake/gmxVersionInfo.cmake
src/gromacs/gmxana/gmx_tune_pme.cpp
src/gromacs/gmxlib/copyrite.cpp
src/gromacs/gmxlib/gmx_detect_hardware.cpp
src/gromacs/gmxlib/gmx_thread_affinity.cpp
src/gromacs/gmxpreprocess/grompp.cpp
src/gromacs/trajectoryanalysis/modules/select.cpp
src/programs/mdrun/md.cpp
src/programs/mdrun/runner.cpp