Merge branch 'master' into cpp-private
authorTeemu Murtola <teemu.murtola@cbr.su.se>
Thu, 14 Oct 2010 14:27:58 +0000 (16:27 +0200)
committerTeemu Murtola <teemu.murtola@cbr.su.se>
Thu, 14 Oct 2010 14:27:58 +0000 (16:27 +0200)
commitbf3e84b9bc3cbca07d17e83c161a468f2b2c87d0
treecacf35ebb17a80815316dafe926d003eac873433
parent1336af4deb271193d28b1e0c477715d7d45e5d38
parent9cb26d478eeef8d8aac88863f5ae77565a3a73e5
Merge branch 'master' into cpp-private

Conflicts:
src/gromacs/selection/parser.cpp
src/gromacs/selection/scanner.cpp
CMakeLists.txt
src/gmxlib/CMakeLists.txt
src/gromacs/selection/compiler.cpp
src/gromacs/selection/evaluate.cpp
src/gromacs/selection/parser.cpp
src/gromacs/selection/parser.h
src/gromacs/selection/parser.y
src/gromacs/selection/scanner.cpp
src/gromacs/selection/scanner.l
src/gromacs/selection/selhelp.cpp