Merge branch 'master' into rotation
authorCarsten Kutzner <ckutzne@gwdg.de>
Thu, 4 Nov 2010 09:42:45 +0000 (10:42 +0100)
committerCarsten Kutzner <ckutzne@gwdg.de>
Thu, 4 Nov 2010 09:42:45 +0000 (10:42 +0100)
commit40df96b42ef273bdde46788f43e792a3885808bf
treecd4443822eb0d6f4f8643bc3591e0b782b979ac3
parent4fa92bec4f3a0bf206baa6d060e5bc84ba8a2549
parent2d1cc0b65ef1bbeec34ed2ee50c3c378174aee74
Merge branch 'master' into rotation

Conflicts:
src/kernel/runner.c
src/gmxlib/names.c
src/kernel/CMakeLists.txt
src/kernel/Makefile.am
src/kernel/grompp.c
src/kernel/readir.c
src/kernel/runner.c
src/mdlib/mdebin.c
src/tools/gmx_tune_pme.c