Merge branch release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Wed, 7 Dec 2016 04:16:48 +0000 (15:16 +1100)
committerMark Abraham <mark.j.abraham@gmail.com>
Wed, 7 Dec 2016 04:17:43 +0000 (15:17 +1100)
commit4bf561e62222eea4e545ab9f5d7429f767e188cf
treef2a60b3dc5e9f73a8421e5df527ed1019239f949
parentd37e2180f320aee4a066623f5f0f108a63f93ebe
parentc848f4a4b18eed9cd36d97a59d5d97f0cdd5ad4e
Merge branch release-2016

Ignored fix to zlib management for GMX_EXTERNAL_TNG=on because that
was already a feature of the refactoring of TNG management in master
branch.

Change-Id: I8bc7ce196fb0d64685c6957b5055d73ff093d864
src/gromacs/gmxana/gmx_trjconv.cpp
src/gromacs/selection/compiler.cpp
src/gromacs/selection/sm_simple.cpp
src/gromacs/selection/tests/selectioncollection.cpp
src/gromacs/tools/dump.cpp
src/programs/mdrun/membed.cpp