Merge branch release-2019
authorMark Abraham <mark.j.abraham@gmail.com>
Sat, 2 Mar 2019 03:28:49 +0000 (21:28 -0600)
committerMark Abraham <mark.j.abraham@gmail.com>
Sat, 2 Mar 2019 03:28:49 +0000 (21:28 -0600)
commit65388d2c12d70c540f5d1404203736f24bd1bede
tree1033cb6526c2c8d4fd74374ec331761e828b4079
parent2da186e3bc9ca1d6a951c0bc99e75b4fc85a6fc6
parente9d862ea4c857ffab6ac21506d07c649f36374fb
Merge branch release-2019

Change-Id: Ib12dea8e32d62a0cf12b8cab6ed8162ce6a40561
src/gromacs/gmxana/gmx_trjconv.cpp
src/gromacs/gmxpreprocess/readir.cpp