Public Git Hosting - gromacs/adressmacs.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: a828180 55f96ef)

commit	f2e83d6eb1813bded5b1a0b14daf1f210bea2249
author	Carsten Kutzner <ckutzne@gwdg.de>
	Wed, 13 Jan 2010 15:02:35 +0000 (13 16:02 +0100)
committer	Carsten Kutzner <ckutzne@gwdg.de>
	Wed, 13 Jan 2010 15:02:35 +0000 (13 16:02 +0100)
tree	d2df7fc52550ea8662ca0ebb0da44db0579561e5	tree \| snapshot (tar.gz zip)
parent	a8281804e8a9d1ca9256c449dad16957c7288816	commit \| diff
parent	55f96ef3f2863fce139c94ac721bd1a66b8db970	commit \| diff

Merge branch 'master' into rotation

Conflicts:

include/gmx_wallcycle.h
src/mdlib/gmx_wallcycle.c
src/mdlib/mdebin.c

17 files changed:

include/gmx_wallcycle.h	diff1 \|	diff2 \|	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/tpxio.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/txtdump.c	diff1 \|	diff2 \|	blob \| history
src/kernel/md.c	diff1 \|	diff2 \|	blob \| history
src/kernel/mdrun.c	diff1 \|	diff2 \|	blob \| history
src/kernel/readir.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/domdec.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/edsam.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

got merge a long time ago