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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 4559384 70346c0)

author	Szilard Pall <pszilard@cbr.su.se>
	Mon, 3 Sep 2012 10:40:56 +0000 (12:40 +0200)
committer	Szilard Pall <pszilard@cbr.su.se>
	Mon, 3 Sep 2012 10:40:56 +0000 (12:40 +0200)
commit	0456fcaacf7bd376eebe6f64193cd9e36b8d2493
tree	d7bfd0b522351354897adefe17596b6d8a445f89	tree \| snapshot
parent	45593843ff4b055a80a9a129f0edafab0c33eb9e	commit \| diff
parent	70346c0e12074867847d2107b18f31f886890b5b	commit \| diff

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

Conflicts:
src/mdlib/tpi.c

Change-Id: I1b5d92291ece7cf3194b4e1d88cd686a5aa18696

share/top/charmm27.ff/aminoacids.rtp	diff1 \|	diff2 \|	blob \| history
src/kernel/gmxcheck.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/domdec.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/edsam.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/pme.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/sim_util.c	diff1 \|	diff2 \|	blob \| history
src/mdlib/tpi.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_energy.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_trjconv.c	diff1 \|	diff2 \|	blob \| history
src/tools/make_edi.c	diff1 \|	diff2 \|	blob \| history

Local GROMACS mirror with custom stuff