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

author	Christoph Junghans <junghans@mpip-mainz.mpg.de>
	Mon, 24 Jan 2011 11:30:13 +0000 (12:30 +0100)
committer	Christoph Junghans <junghans@mpip-mainz.mpg.de>
	Mon, 24 Jan 2011 11:30:13 +0000 (12:30 +0100)
commit	79cb8a58458a958679f3ac88bc7b142a52dcf5c7
tree	355b5d58b853dc1fe1c8d8296cf82a3f4ba3df0c	tree \| snapshot
parent	b9767b5845d73064829110a78c0572ad96a2411e	commit \| diff
parent	7c1df0fc1c9fc7fbb18a2688cae891d4deb73737	commit \| diff

Merge branch 'release-4-5-patches'

Conflicts:
src/kernel/grompp.c
src/kernel/md.c
src/kernel/readir.c

Local GROMACS mirror with custom stuff

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readir.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/gmx_fft_fftw2.c	diff1 \|	diff2 \|	blob \| history
src/programs/g_protonate/g_protonate.c	diff1 \|	diff2 \|	blob \| history
src/programs/g_x2top/g_x2top.c	diff1 \|	diff2 \|	blob \| history
src/programs/gmxdump/gmxdump.c	diff1 \|	diff2 \|	blob \| history
src/programs/grompp/grompp.c	diff1 \|	\|	blob \| history
src/programs/mdrun/md.c	diff1 \|	\|	blob \| history
src/programs/mdrun/repl_ex.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_membed.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_msd.c	diff1 \|	diff2 \|	blob \| history