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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: a5d0647 f370f9b)

author	David van der Spoel <spoel@anfinsen.bmc.uu.se>
	Sun, 30 Jan 2011 18:24:40 +0000 (19:24 +0100)
committer	David van der Spoel <spoel@anfinsen.bmc.uu.se>
	Sun, 30 Jan 2011 18:24:40 +0000 (19:24 +0100)
commit	b71493132f40da33334ac5bb05ba7acd564afbce
tree	977b8f1283e09326514e2ddd53ed3fda03e6a06c	tree \| snapshot
parent	a5d0647c86facc188bb972dda8d9edabb2097c9d	commit \| diff
parent	f370f9b869e7f100ece6567da8bb3562d51f3eb0	commit \| diff

Merge branch 'release-4-5-patches' into orderparm
Merged in some new code from Bjorn Steen Saethre.

Conflicts:

src/tools/Makefile.am
src/tools/expfit.c
src/tools/levenmar.c

include/gmxcomplex.h	diff1 \|	diff2 \|	blob \| history
include/gstat.h	diff1 \|	diff2 \|	blob \| history
src/tools/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/tools/dens_filter.c	\|	\|	blob
src/tools/dens_filter.h	\|	\|	blob
src/tools/expfit.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_densorder.c	diff1 \|	\|	blob \| history
src/tools/gmx_hydorder.c	diff1 \|	\|	blob \| history
src/tools/levenmar.c	diff1 \|	diff2 \|	blob \| history

Local GROMACS mirror with custom stuff