Merge remote branch 'origin/release-4-5-patches'
authorChristoph Junghans <junghans@mpip-mainz.mpg.de>
Fri, 1 Jul 2011 12:03:46 +0000 (14:03 +0200)
committerChristoph Junghans <junghans@mpip-mainz.mpg.de>
Fri, 1 Jul 2011 12:03:46 +0000 (14:03 +0200)
commit1a13a0b75f803930882ffdb1b9c9660b44204036
tree0fd71ff41efe1f64522bcd57a463dfa1fb1e1040
parent352e0dd89fb3f95a38776491fb5774b11f6aa420
parentb1c601ca6ff5ac955226290576560b05af5d658c
Merge remote branch 'origin/release-4-5-patches'

Conflicts:
src/gromacs/libgromacs.pc.cmakein
CMakeLists.txt
src/gromacs/gmxlib/checkpoint.c
src/gromacs/gmxlib/copyrite.c
src/gromacs/gmxlib/symtab.c
src/gromacs/gmxpreprocess/readir.c
src/gromacs/libgromacs.pc.cmakein
src/gromacs/mdlib/clincs.c
src/gromacs/mdlib/forcerec.c
src/gromacs/mdlib/pull.c
src/programs/tpbconv/tpbconv.c