Merge branch release-2018
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 3 May 2018 22:36:10 +0000 (00:36 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Thu, 3 May 2018 22:36:10 +0000 (00:36 +0200)
Change-Id: Id7d4f6e99dc4ec396ed5d4018c885a495b6a677f

1  2 
src/gromacs/gmxana/gmx_trjconv.cpp
src/gromacs/mdlib/mdatoms.cpp

Simple merge
Simple merge