Merge branch release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 20 Oct 2017 10:05:05 +0000 (12:05 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Fri, 20 Oct 2017 10:05:05 +0000 (12:05 +0200)
commit7cd8477fa2140254c0fbfa5b7610570f2491307e
tree97c9054d3ea7743955717370fd95b7a1ca12851c
parentedaa49b2c115681a718fe5b53483e9c2b76ae577
parent53473bb9f64c7861fcb60ddb997d53ca955096bb
Merge branch release-2016

Dropped the post-submit change because where we test
with older clang we now always specify a suitable
status for openmp.

Change-Id: I993da20856861c0b8a0888f7fa0deed8853349a8
src/gromacs/gmxlib/nrnb.cpp
src/gromacs/mdlib/trajectory_writing.cpp