Merge branch release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Sat, 14 Jan 2017 20:58:57 +0000 (21:58 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Sat, 14 Jan 2017 21:21:56 +0000 (22:21 +0100)
commitaf3f1d02d679684f32eef97f48bb23031e41033d
tree08c7f178709dbc012cb994c7ce7a131b4af94494
parent1d7cafd910c078a64533d2a0bd9f568f41420488
parent4feb0be323f54d22f29775d4a2b1c2b839d34422
Merge branch release-2016

Retained master branch version of fixes for ICC on windows.

Preserved the fix for 2efc195a97f92 despite refactoring of init_em.

Change-Id: Iae54ac040cb2d72d38b0bf3a0a762a9384e4c02d
12 files changed:
CMakeLists.txt
cmake/FindFFTW.cmake
cmake/gmxCFlags.cmake
cmake/gmxManagePluginSupport.cmake
cmake/gmxTestCXX11.cmake
src/gromacs/domdec/domdec_topology.cpp
src/gromacs/gmxana/gmx_anaeig.cpp
src/gromacs/gmxana/gmx_covar.cpp
src/gromacs/gmxana/gmx_editconf.cpp
src/gromacs/gmxana/gmx_nmeig.cpp
src/gromacs/gmxana/gmx_tune_pme.cpp
src/gromacs/mdlib/minimize.cpp