Merge branch release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 31 Mar 2017 14:29:54 +0000 (16:29 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Fri, 31 Mar 2017 14:29:54 +0000 (16:29 +0200)
commitec0a82104370149e37c4f06735cc45fe27ae8647
treefe18c114b437ae0e831272d06abe43f46c4b20eb
parent22f85e2993547a650f6513db26b1865a45c54bae
parentfb11d6cb7892a20e1e324efc4ea12cc43e73fa95
Merge branch release-2016

Change-Id: I536af0bcfba93ecf3e2afeb847120dc8f637cc92
docs/CMakeLists.txt
src/gromacs/gmxana/gmx_xpm2ps.cpp
src/gromacs/gmxpreprocess/readir.cpp