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)
commitb2b599afcfa06774f4f2f14d8f954e5de508dcc2
tree3005d045dd9b4d5374d420044293fc74cbfc476e
parente510bd140429a1b650473241b26449fd87fa4764
parentdb33bb790d03a97604764514f396bcde025530db
Merge branch release-2018

Change-Id: Id7d4f6e99dc4ec396ed5d4018c885a495b6a677f
src/gromacs/gmxana/gmx_trjconv.cpp
src/gromacs/mdlib/mdatoms.cpp