Merge branch release-2016
authorTeemu Murtola <teemu.murtola@gmail.com>
Mon, 12 Dec 2016 19:39:12 +0000 (21:39 +0200)
committerTeemu Murtola <teemu.murtola@gmail.com>
Mon, 12 Dec 2016 20:36:50 +0000 (22:36 +0200)
commitf4c9cb55c5629a113779a4b7d65d1215fde91906
tree33ba8612b23bbb0f042e2e431420ab1d8baa984c
parentdd116125aa7f6ae7a37b876b320fc963c9e033bc
parent7952be34e81e90b74a0bc97d6bde92935239b0b5
Merge branch release-2016

Conflicts:
    cmake/gmxVersionInfo.cmake

Add a suppression for Intel compiler warning in generated code in
scanner.cpp.

Change-Id: I3a6310c433a50202fbc76e53570a491bd3d06544
CMakeLists.txt
admin/builds/gromacs.py
cmake/gmxVersionInfo.cmake
src/gromacs/CMakeLists.txt
src/gromacs/selection/scanner.cpp
src/gromacs/selection/scanner.l
src/gromacs/selection/scanner_flex.h