Merge release-5-0 into master
authorTeemu Murtola <teemu.murtola@gmail.com>
Wed, 9 Jul 2014 05:02:21 +0000 (08:02 +0300)
committerTeemu Murtola <teemu.murtola@gmail.com>
Wed, 9 Jul 2014 05:02:21 +0000 (08:02 +0300)
commit75b05a363b39cde9137bc6d66969268aee311cd1
tree032d5685bbc3c5f6f97288a910bb03c58c79bab2
parenta4aad8cd38d667911ade4125bf5825cf67a62f17
parent5b0ad235891027b8b6f6995a6f5d140d17a53744
Merge release-5-0 into master

Conflicts:
cmake/gmxCFlags.cmake (adjacent changes)

Change-Id: I45088d7b5256613971b9926fc5fa50511a2ed743
CMakeLists.txt
cmake/gmxCFlags.cmake
src/gromacs/math/utilities.c
src/gromacs/selection/scanner.cpp
src/gromacs/selection/scanner.l
src/gromacs/selection/tests/selectioncollection.cpp
src/gromacs/utility/cstringutil.h