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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 30b6087 8493d96)

author	Roland Schulz <roland@utk.edu>
	Tue, 20 Dec 2011 12:28:48 +0000 (07:28 -0500)
committer	Roland Schulz <roland@utk.edu>
	Tue, 20 Dec 2011 12:28:48 +0000 (07:28 -0500)
commit	30e460710761d7a0bb8446b19ebb1a17e0ff198e
tree	4557926f7e37c39ea14ba3c3f7476b4427306e34	tree \| snapshot
parent	30b6087f7b9b159f74ead3545817d70f334f35c8	commit \| diff
parent	8493d96300b5ac46a6c08503128a312849b148e9	commit \| diff

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

Conflicts:
admin/GerritBuild.bat
include/gstat.h
src/tools/anadih.c
src/tools/gmx_chi.c

Change-Id: If70475e8f38978aeb52652afce2ca2a62d355987

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
admin/GerritBuild.bat	diff1 \|	diff2 \|	blob \| history
include/gstat.h	diff1 \|	diff2 \|	blob \| history
src/tools/anadih.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_chi.c	diff1 \|	diff2 \|	blob \| history

Local GROMACS mirror with custom stuff