Merge branch 'release-4-5-patches' into rotation-4-5
authorCarsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
Fri, 27 Aug 2010 09:34:59 +0000 (11:34 +0200)
committerCarsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
Fri, 27 Aug 2010 09:34:59 +0000 (11:34 +0200)
commite2d718f47004adfbafc8ed1445354d47587e65a5
treefdded75a3557b14f8624bedc2687e08adbc9142a
parent70be5ef34fd591c3ffee55e8552b84e72fd27b51
parentbe6e6de5c7a2cde5730cd96904b3e7fe89c4ea62
Merge branch 'release-4-5-patches' into rotation-4-5

Conflicts:
src/gmxlib/tpxio.c
src/mdlib/mdebin.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