biod.pnpi.spb.ru / alexxy / gromacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1333a48 64f14c6)
Merge branch release-2016 into release-2018
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 20 Mar 2018 22:17:51 +0000 (23:17 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Tue, 20 Mar 2018 22:17:51 +0000 (23:17 +0100)
Conflict in pre-submit matrix, kept 2018 content that already
has the same logical change made.

Change-Id: I40b2db8d149388bed07471fcdb8082b0fc92b9b5


Trivial merge
Local GROMACS mirror with custom stuff