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)
Change-Id: I536af0bcfba93ecf3e2afeb847120dc8f637cc92

1  2 
docs/CMakeLists.txt
src/gromacs/gmxana/gmx_xpm2ps.cpp
src/gromacs/gmxpreprocess/readir.cpp

Simple merge
Simple merge
Simple merge