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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 8c01f81 7117737)

author	Roland Schulz <roland@utk.edu>
	Thu, 23 Feb 2012 21:53:43 +0000 (16:53 -0500)
committer	Roland Schulz <roland@utk.edu>
	Thu, 23 Feb 2012 21:53:43 +0000 (16:53 -0500)
commit	8c5f7d66768e5389e58cdc0405158faaec1cd444
tree	42183a2793e969e27fb46248009a5292a9249e19	tree \| snapshot
parent	8c01f81bf80991d65e817714856bdddd8e0f43f0	commit \| diff
parent	71177370e0abae095e4f535067e6baacff096dd7	commit \| diff

Merge release-4-6 into master

Conflicts:
admin/GerritBuild.bat
src/gromacs/mdlib/gmx_fft_fftw2.c

Change-Id: I2d589e163b438a590da03a08953fbf235abfcb4d

15 files changed:

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
admin/GerritBuild.bat	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/copyrite.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/maths.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/tpxio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readir.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/topio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/topio.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/maths.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/thread_mpi/atomic/gcc_x86.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/types/simple.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/mdebin_bar.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/qm_gaussian.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/qmmm.c	diff1 \|	diff2 \|	blob \| history
src/programs/grompp/grompp.c	diff1 \|	diff2 \|	blob \| history

Local GROMACS mirror with custom stuff