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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: d120c37 372187d)

author	Mark Abraham <mark.j.abraham@gmail.com>
	Thu, 17 Jan 2013 18:29:08 +0000 (19:29 +0100)
committer	Mark Abraham <mark.j.abraham@gmail.com>
	Thu, 17 Jan 2013 18:48:37 +0000 (19:48 +0100)
commit	220f03d96871ac6e5c77386c75c1576e2325903e
tree	af034af04bec1b6be61315633e2b2e8201e082d2	tree \| snapshot
parent	d120c370ad823079c69dfff5b7f9b70dc4e8bf68	commit \| diff
parent	372187d7df84cbb554845ce944686165722e1813	commit \| diff

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

Conflicts:
src/gmxlib/disre.c
src/kernel/runner.c
src/mdlib/minimize.c
src/tools/gmx_membed.c

Change-Id: I1d5f72a3a9b8468cf478890791bc67d247c1e2c5

include/disre.h	diff1 \|	diff2 \|	blob \| history
src/gmxlib/disre.c	diff1 \|	diff2 \|	blob \| history
src/gmxlib/mtop_util.c	diff1 \|	diff2 \|	blob \| history
src/kernel/gmxdump.c	diff1 \|	diff2 \|	blob \| history
src/kernel/runner.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/minimize.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_disre.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_trjconv.c	diff1 \|	diff2 \|	blob \| history

Local GROMACS mirror with custom stuff