Merge branch 'release-4-5-patches'
authorTeemu Murtola <teemu.murtola@gmail.com>
Fri, 19 Apr 2013 03:50:37 +0000 (06:50 +0300)
committerTeemu Murtola <teemu.murtola@gmail.com>
Fri, 19 Apr 2013 03:50:37 +0000 (06:50 +0300)
commit5955807cafb0e7b74e47592082523736f5817713
tree30b8e2df387856634ed2cf0f4baf7084cb755c44
parent4af5c1bb7969e2e74d1e115f17d6e4ca92c4d776
parent3a0803dad8f5b54f0f83476b510230c0071c016b
Merge branch 'release-4-5-patches'

Tested that the selection fixes work also in release-4-6.

Conflicts:
src/gmxlib/selection/compiler.c (trivial)

Change-Id: Ib679b1babaf29457c13ca1f10fde5a612ddc3055
src/gmxlib/selection/compiler.c
src/gmxlib/selection/evaluate.c