Public Git Hosting - gromacs.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 70be5ef be6e6de)

commit	e2d718f47004adfbafc8ed1445354d47587e65a5
author	Carsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
	Fri, 27 Aug 2010 09:34:59 +0000 (27 11:34 +0200)
committer	Carsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
	Fri, 27 Aug 2010 09:34:59 +0000 (27 11:34 +0200)
tree	fdded75a3557b14f8624bedc2687e08adbc9142a	tree \| snapshot (tar.gz zip)
parent	70be5ef34fd591c3ffee55e8552b84e72fd27b51	commit \| diff
parent	be6e6de5c7a2cde5730cd96904b3e7fe89c4ea62	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
include/names.h	diff1 \|	diff2 \|	blob \| history
include/pull_rotation.h	diff1 \|	\|	blob \| history
include/types/enums.h	diff1 \|	diff2 \|	blob \| history
include/types/inputrec.h	diff1 \|	diff2 \|	blob \| history
src/gmxlib/mvdata.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/names.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/network.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/tpxio.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/txtdump.c	diff1 \|	diff2 \|	blob \| history
src/kernel/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/kernel/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/kernel/grompp.c	diff1 \|	diff2 \|	blob \| history
src/kernel/mdrun.c	diff1 \|	diff2 \|	blob \| history
src/kernel/readir.c	diff1 \|	diff2 \|	blob \| history
src/kernel/readir.h	diff1 \|	diff2 \|	blob \| history
src/kernel/readrot.c	diff1 \|	\|	blob \| history
src/kernel/runner.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/mdlib/domdec.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/gmx_wallcycle.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/mdebin.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/pull_rotation.c	diff1 \|	\|	blob \| history
src/mdlib/sim_util.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_tune_pme.c	diff1 \|	diff2 \|	blob \| history

The ultimate molecular dynamics simulation package