Merge branch 'master' into rotation
authorCarsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
Tue, 6 Jul 2010 09:41:22 +0000 (11:41 +0200)
committerCarsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
Tue, 6 Jul 2010 09:41:22 +0000 (11:41 +0200)
commit2c45a2878b2c1d62ef994476d692dd52db0f2223
tree49f5982930fb2e295e6780776f7e9b429b919e6e
parent8b0a7303f8aa1ef8e6fa768c6d19e9db609c5240
parent1190fabc3007d1e619300c88c7d9c847a44600a4
Merge branch 'master' into rotation

Conflicts:
src/gmxlib/tpxio.c
src/kernel/runner.c
14 files changed:
include/mpelogging.h
include/types/inputrec.h
src/gmxlib/network.c
src/gmxlib/tpxio.c
src/kernel/Makefile.am
src/kernel/grompp.c
src/kernel/mdrun.c
src/kernel/readir.c
src/kernel/runner.c
src/mdlib/Makefile.am
src/mdlib/domdec.c
src/mdlib/mdebin.c
src/mdlib/sim_util.c
src/tools/gmx_tune_pme.c