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

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

author	Roland Schulz <roland@utk.edu>
	Tue, 1 Feb 2011 18:15:37 +0000 (13:15 -0500)
committer	Roland Schulz <roland@utk.edu>
	Tue, 1 Feb 2011 18:15:37 +0000 (13:15 -0500)
commit	24e0a341512eff8984c1541140e01e9d52bb6fa5
tree	5a5152537c87a51b5ec79e46021f67f41da7d0ab	tree \| snapshot
parent	79cb8a58458a958679f3ac88bc7b142a52dcf5c7	commit \| diff
parent	4d200dc02260805cbcf8ce0fad0bca682e13f946	commit \| diff

Merge remote branch 'origin/release-4-5-patches'

Conflicts:
src/tools/CMakeLists.txt
src/tools/Makefile.am
src/tools/gmx_membed.c
src/tools/gmx_saltbr.c

Conflict of adding g_options: Undid adding of g_options to src/tools/CMakeLists.txt
IssueID #690

22 files changed:

src/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/copyrite.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/statutil.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/wman.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readir.c	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/gmx_ana.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/matrix.h	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/gmxcheck/gmxcheck.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/mdrun.c	diff1 \|	\|	blob \| history
src/programs/pdb2gmx/pdb2gmx.c	diff1 \|	diff2 \|	blob \| history
src/programs/tpbconv/tpbconv.c	diff1 \|	diff2 \|	blob \| history
src/tools/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_membed.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_msd.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_pme_error.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_saltbr.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_select.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_tune_pme.c	diff1 \|	diff2 \|	blob \| history

Local GROMACS mirror with custom stuff

RSS Atom

src/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/copyrite.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/statutil.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/wman.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readir.c	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/gmx_ana.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/matrix.h	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/gmxcheck/gmxcheck.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/mdrun.c	diff1 \|	\|	blob \| history
src/programs/pdb2gmx/pdb2gmx.c	diff1 \|	diff2 \|	blob \| history
src/programs/tpbconv/tpbconv.c	diff1 \|	diff2 \|	blob \| history
src/tools/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_membed.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_msd.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_pme_error.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_saltbr.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_select.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_tune_pme.c	diff1 \|	diff2 \|	blob \| history