Public Git Hosting - gromacs.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 8b0a730 1190fab)

commit	2c45a2878b2c1d62ef994476d692dd52db0f2223
author	Carsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
	Tue, 6 Jul 2010 09:41:22 +0000 (6 11:41 +0200)
committer	Carsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
	Tue, 6 Jul 2010 09:41:22 +0000 (6 11:41 +0200)
tree	49f5982930fb2e295e6780776f7e9b429b919e6e	tree \| snapshot (tar.gz zip)
parent	8b0a7303f8aa1ef8e6fa768c6d19e9db609c5240	commit \| diff
parent	1190fabc3007d1e619300c88c7d9c847a44600a4	commit \| diff

Merge branch 'master' into rotation

Conflicts:
src/gmxlib/tpxio.c
src/kernel/runner.c

14 files changed:

include/mpelogging.h	diff1 \|	diff2 \|	blob \| history
include/types/inputrec.h	diff1 \|	diff2 \|	blob \| history
src/gmxlib/network.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/tpxio.c	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/runner.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/mdlib/domdec.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/mdebin.c	diff1 \|	diff2 \|	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