Merge branch release-2016
commite02333909decfde2012b81ccc6a9d6bf4f664401
authorMark Abraham <mark.j.abraham@gmail.com>
Sun, 17 Sep 2017 21:43:42 +0000 (17 23:43 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Sun, 17 Sep 2017 21:43:42 +0000 (17 23:43 +0200)
tree71718fd978355528ca27be7fe45cc80b4b707613
parent435faa8a994f336740e9f7d35f0c742478e57912
parentf45ad22feb28df03e0807331a3c935829b2b1158
Merge branch release-2016

Kept a cmake variable description string from release-2016

Change-Id: I2077780afbbe3cc610d699ea498caa6959e4000c
cmake/gmxVersionInfo.cmake
src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h