Merge branch release-2018
authorMark Abraham <mark.j.abraham@gmail.com>
Wed, 29 Aug 2018 14:34:10 +0000 (16:34 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Wed, 29 Aug 2018 14:38:08 +0000 (16:38 +0200)
commit54b7d9e9225af9fe0901c6d4f98e889e681d1b65
tree99ad32b25e114926b512efb8d720d0c527616952
parent9864b201bbd9133943ba3e366bf50f705f0fe259
parentddad5326c779275ba2ac82e4fda6b1bb01572469
Merge branch release-2018

Trivial clash in post-submit matrix, where a TODO resolved in 2018
release collided with a new TODO in master branch.

Change-Id: I07366ecb232c7341c8cf17674be3112f44fc9cdd
admin/builds/gromacs.py
admin/builds/post-submit-matrix.txt
src/gromacs/fileio/tngio.cpp
src/gromacs/tools/dump.cpp
src/gromacs/utility/binaryinformation.cpp