Public Git Hosting - gromacs/rigid-bodies.git/commit

commit	ea2a168b9cb9755857f65e815a1878be42d434b6
author	Michael Shirts <michael.shirts@virginia.edu>
	Sat, 5 Dec 2009 03:48:32 +0000 (4 22:48 -0500)
committer	Michael Shirts <michael.shirts@virginia.edu>
	Sat, 5 Dec 2009 03:48:32 +0000 (4 22:48 -0500)
tree	64a06390694b7eed53b346b8bbe3f1b136455f4a	tree \| snapshot (tar.gz zip)
parent	49bbd38258886e8e251d804ec1b4e96c87d64e89	commit \| diff
parent	a0ee4c3d456e1b941c40b05da4bed5dfdff422d9	commit \| diff

Merge branch 'master' of git@git.gromacs.org:gromacs

Conflicts:
include/maths.h
include/types/state.h
src/gmxlib/pbc.c
src/kernel/md.c
src/mdlib/constr.c
src/mdlib/force.c
src/mdlib/mdebin.c
src/mdlib/sim_util.c

27 files changed:

include/constr.h	diff1 \|	diff2 \|	blob \| history
include/maths.h	diff1 \|	diff2 \|	blob \| history
include/mdebin.h	diff1 \|	diff2 \|	blob \| history
include/mdrun.h	diff1 \|	diff2 \|	blob \| history
include/tgroup.h	diff1 \|	diff2 \|	blob \| history
include/types/enums.h	diff1 \|	diff2 \|	blob \| history
include/types/group.h	diff1 \|	diff2 \|	blob \| history
include/types/idef.h	diff1 \|	diff2 \|	blob \| history
include/types/inputrec.h	diff1 \|	diff2 \|	blob \| history
include/types/state.h	diff1 \|	diff2 \|	blob \| history
include/update.h	diff1 \|	diff2 \|	blob \| history
include/vec.h	diff1 \|	diff2 \|	blob \| history
src/gmxlib/checkpoint.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/mvdata.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/pbc.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/tpxio.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/txtdump.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/typedefs.c	diff1 \|	diff2 \|	blob \| history
src/kernel/gmxdump.c	diff1 \|	diff2 \|	blob \| history
src/kernel/md.c	diff1 \|	diff2 \|	blob \| history
src/kernel/readir.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/constr.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/domdec.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/force.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_order.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

include/constr.h	diff1 \|	diff2 \|	blob \| history
include/maths.h	diff1 \|	diff2 \|	blob \| history
include/mdebin.h	diff1 \|	diff2 \|	blob \| history
include/mdrun.h	diff1 \|	diff2 \|	blob \| history
include/tgroup.h	diff1 \|	diff2 \|	blob \| history
include/types/enums.h	diff1 \|	diff2 \|	blob \| history
include/types/group.h	diff1 \|	diff2 \|	blob \| history
include/types/idef.h	diff1 \|	diff2 \|	blob \| history
include/types/inputrec.h	diff1 \|	diff2 \|	blob \| history
include/types/state.h	diff1 \|	diff2 \|	blob \| history
include/update.h	diff1 \|	diff2 \|	blob \| history
include/vec.h	diff1 \|	diff2 \|	blob \| history
src/gmxlib/checkpoint.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/mvdata.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/pbc.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/tpxio.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/txtdump.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/typedefs.c	diff1 \|	diff2 \|	blob \| history
src/kernel/gmxdump.c	diff1 \|	diff2 \|	blob \| history
src/kernel/md.c	diff1 \|	diff2 \|	blob \| history
src/kernel/readir.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/constr.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/domdec.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/force.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_order.c	diff1 \|	diff2 \|	blob \| history