Merge commit '4d39dbdaa88b63df182fb3ca1d9133f2809277c1' into cpp-migration
authorTeemu Murtola <teemu.murtola@cbr.su.se>
Sun, 26 Dec 2010 15:29:22 +0000 (17:29 +0200)
committerTeemu Murtola <teemu.murtola@cbr.su.se>
Sun, 26 Dec 2010 15:29:22 +0000 (17:29 +0200)
commite52295c8b557c1682d11bd18dbfbc574b3274b0d
treed198eb493463ef611aa186f50f4cd08392dd6322
parentfc190aba990e0b48bd63c9741bc5362e7205ee90
parent4d39dbdaa88b63df182fb3ca1d9133f2809277c1
Merge commit '4d39dbdaa88b63df182fb3ca1d9133f2809277c1' into cpp-migration

Build system had to be restructured for clarity, but otherwise the merge
was successful.

Conflicts:
src/CMakeLists.txt
src/gromacs/CMakeLists.txt
CMakeLists.txt
src/gromacs/CMakeLists.txt
src/gromacs/errorreporting/CMakeLists.txt
src/gromacs/fatalerror/CMakeLists.txt
src/gromacs/options/CMakeLists.txt
src/gromacs/options/tests/CMakeLists.txt