Merge release-5-0 into master
authorTeemu Murtola <teemu.murtola@gmail.com>
Sat, 5 Jul 2014 16:14:21 +0000 (19:14 +0300)
committerTeemu Murtola <teemu.murtola@gmail.com>
Sat, 5 Jul 2014 16:18:41 +0000 (19:18 +0300)
commitda2c526f7883bd6c37de995c37bc80d1f0771681
tree17c87e9e80a6a7964e7e9962cbec50daa2eeb209
parentc6f80ffdbb1e9e0007d9f211d5a39cafdb802742
parent7e97b8c753fe49eaaf8db4cb708cf2bf64bfd842
Merge release-5-0 into master

Change-Id: I9813e3770c78f62c9003987b22c0315c89c87485
CMakeLists.txt
src/gromacs/CMakeLists.txt
src/gromacs/gmxlib/CMakeLists.txt
src/gromacs/selection/parsetree.cpp
src/gromacs/selection/selectioncollection.cpp
src/gromacs/selection/selelem.h
src/gromacs/selection/selmethod.h
src/gromacs/selection/tests/selectioncollection.cpp