Merge branch 'master' into rotation
commit8fe4454201a355305bb743de67835610ba9003fa
authorCarsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
Fri, 27 Aug 2010 11:37:13 +0000 (27 13:37 +0200)
committerCarsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
Fri, 27 Aug 2010 11:37:13 +0000 (27 13:37 +0200)
treeca4f6e4bf353adda468fe1ff35b7ab0eb5285ccc
parent70be5ef34fd591c3ffee55e8552b84e72fd27b51
parent860cdb58313a3b37d01454b8aa5cd693bf49e2a2
Merge branch 'master' into rotation

Conflicts:
src/gmxlib/tpxio.c
25 files changed:
include/gmx_wallcycle.h
include/names.h
include/pull_rotation.h
include/types/enums.h
include/types/inputrec.h
src/gmxlib/mvdata.c
src/gmxlib/names.c
src/gmxlib/network.c
src/gmxlib/tpxio.c
src/gmxlib/txtdump.c
src/kernel/CMakeLists.txt
src/kernel/Makefile.am
src/kernel/grompp.c
src/kernel/mdrun.c
src/kernel/readir.c
src/kernel/readir.h
src/kernel/readrot.c
src/kernel/runner.c
src/mdlib/Makefile.am
src/mdlib/domdec.c
src/mdlib/gmx_wallcycle.c
src/mdlib/mdebin.c
src/mdlib/pull_rotation.c
src/mdlib/sim_util.c
src/tools/gmx_tune_pme.c