BioD PNPI Git Repos - alexxy/gromacs.git/commit

biod.pnpi.spb.ru / alexxy / gromacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6676a6a 0342ca4)

author	Roland Schulz <roland@utk.edu>
	Fri, 13 Jul 2012 13:04:58 +0000 (09:04 -0400)
committer	Roland Schulz <roland@utk.edu>
	Fri, 13 Jul 2012 13:04:58 +0000 (09:04 -0400)
commit	51f2f97d29cb6e57851a4b7ff037068c355e8b72
tree	ffbe2d0331339e5954340015a58a77b7436eb4fe	tree \| snapshot
parent	6676a6ab7da186914296217795d56cfb8afd1d5e	commit \| diff
parent	0342ca467cfab9f944cedc74706e18687b22af73	commit \| diff

Merge release-4.5-patches into HEAD

Conflicts:
src/mdlib/mdebin.c
src/mdlib/minimize.c
src/tools/gmx_hbond.c
src/tools/gmx_tune_pme.c

Change-Id: I114f1ab4d58c9ccca0261e8588b61c39feaae874

14 files changed:

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
include/xdrf.h	diff1 \|	diff2 \|	blob \| history
src/gmxlib/gmxfio.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/libxdrf.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/maths.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/selection/compiler.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/sfactor.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/trxio.c	diff1 \|	diff2 \|	blob \| history
src/kernel/pdb2top.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/domdec_setup.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/mdebin.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/minimize.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_hbond.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_trjcat.c	diff1 \|	diff2 \|	blob \| history

Local GROMACS mirror with custom stuff