biod.pnpi.spb.ru / alexxy / gromacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 58e265e e76e61a)
Merge branch release-2016 into release-2018
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 8 Feb 2018 16:55:11 +0000 (17:55 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Thu, 8 Feb 2018 16:56:36 +0000 (17:56 +0100)
commita52000e59e92a406726007b01d0190f171d50af3
tree897b4b8d81d4a9f5b974dcedc9473459d8b08787tree | snapshot
parent58e265e7d88ffb580e11718e2fa8f06a4589efbfcommit | diff
parente76e61a4023e7351a3d9c6d5919cb930ff68d616commit | diff
Merge branch release-2016 into release-2018

Resolved conflicts in commit matrices by implementing the same logical
change as in release-2016 (move msvc+icc config to post-submit matrix)
in release-2018.

Change-Id: Id5d731e37e54b8c3896763d0a4ca496f99612f0f
admin/builds/post-submit-matrix.txt diff1 | diff2 | blob | history
admin/builds/pre-submit-matrix.txt diff1 | diff2 | blob | history
Local GROMACS mirror with custom stuff