Merge release-5-0 into master
authorTeemu Murtola <teemu.murtola@gmail.com>
Fri, 22 May 2015 10:45:31 +0000 (13:45 +0300)
committerTeemu Murtola <teemu.murtola@gmail.com>
Fri, 22 May 2015 10:46:40 +0000 (13:46 +0300)
commit2926de7dfa1522bd97e9e6a2797b1e7d4955a177
tree839899c3f8c302fab6e7a419d3aaa9ee11a72520
parent57ecfc60bdfc15acc46081a3372c1d1dd9cca037
parent1cdc52e96ae0cffa45114472974122ff035e9b87
Merge release-5-0 into master

Conflicts:
    src/gromacs/selection/tests/selectioncollection.cpp

Took both tests added in the different branches at the same location.

Change-Id: I305dd8e37373c3f913b3e86d0ddb286926c3d0db
src/gromacs/selection/params.cpp
src/gromacs/selection/sm_same.cpp
src/gromacs/selection/tests/selectioncollection.cpp