Public Git Hosting - gromacs.git/commit

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

commit	8fe4454201a355305bb743de67835610ba9003fa
author	Carsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
	Fri, 27 Aug 2010 11:37:13 +0000 (27 13:37 +0200)
committer	Carsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
	Fri, 27 Aug 2010 11:37:13 +0000 (27 13:37 +0200)
tree	ca4f6e4bf353adda468fe1ff35b7ab0eb5285ccc	tree \| snapshot (tar.gz zip)
parent	70be5ef34fd591c3ffee55e8552b84e72fd27b51	commit \| diff
parent	860cdb58313a3b37d01454b8aa5cd693bf49e2a2	commit \| diff

Merge branch 'master' into rotation

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