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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: c34a964 ec45e22)

author	Roland Schulz <roland@utk.edu>
	Mon, 26 Nov 2012 20:04:19 +0000 (15:04 -0500)
committer	Roland Schulz <roland@utk.edu>
	Mon, 26 Nov 2012 20:04:19 +0000 (15:04 -0500)
commit	4924e82d78ae312d659255557618208a749a4863
tree	00d9fac38b4e22d69019c8f94926c67d163fa5b9	tree \| snapshot
parent	c34a964475f12c2900fd65db656363dec8e4acfa	commit \| diff
parent	ec45e222d1cdafbeb82f775f1cc55b6136ed8e3d	commit \| diff

Merge release-4-5-patches into release-4-6

Conflicts (both trivial):
CMakeLists.txt
src/config.h.cmakein

Change-Id: I363ce1c09c68c2be5aa926e893011d43c8ed3337

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/config.h.cmakein	diff1 \|	diff2 \|	blob \| history
src/gmxlib/futil.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_cluster.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_hbond.c	diff1 \|	diff2 \|	blob \| history

Local GROMACS mirror with custom stuff