biod.pnpi.spb.ru / alexxy / gromacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6a6a8d2 d870cd3)
Merge branch 'release-4-6' (incl. AdResS Patch)
authorChristoph Junghans <junghans@votca.org>
Fri, 13 Jan 2012 17:12:43 +0000 (10:12 -0700)
committerChristoph Junghans <junghans@votca.org>
Fri, 13 Jan 2012 17:12:43 +0000 (10:12 -0700)
commit138333ad61b9a332c79682bfc117b80b2b13c3cc
treeb5fc23a5102126a4f8992cf7b93077f713ebf1d8tree | snapshot
parent6a6a8d232f96105e5e216283a25f3838496474bccommit | diff
parentd870cd31bee97e277f48ba982da85303bce98611commit | diff
Merge branch 'release-4-6' (incl. AdResS Patch)

Conflicts:
CMakeLists.txt
src/gmxlib/CMakeLists.txt
src/kernel/CMakeLists.txt

Change-Id: I9760ea1165deb8ee5d38e476a0a24689621af39f
175 files changed:
CMakeLists.txt diff1 | diff2 | blob | history
src/gromacs/gmxlib/CMakeLists.txt diff1 | | blob | history
src/gromacs/gmxlib/copyrite.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/mvdata.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/names.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_generic_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_generic_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel010_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel010_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel020_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel020_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel030_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel030_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel100_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel100_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel101_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel101_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel102_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel102_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel103_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel103_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel104_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel104_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel110_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel110_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel111_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel111_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel112_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel112_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel113_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel113_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel114_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel114_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel120_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel120_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel121_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel121_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel122_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel122_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel123_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel123_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel124_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel124_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel130_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel130_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel131_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel131_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel132_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel132_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel133_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel133_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel134_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel134_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel200_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel200_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel201_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel201_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel202_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel202_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel203_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel203_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel204_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel204_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel210_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel210_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel211_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel211_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel212_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel212_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel213_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel213_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel214_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel214_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel220_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel220_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel221_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel221_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel222_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel222_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel223_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel223_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel224_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel224_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel230_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel230_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel231_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel231_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel232_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel232_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel233_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel233_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel234_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel234_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel300_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel300_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel301_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel301_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel302_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel302_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel303_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel303_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel304_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel304_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel310_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel310_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel311_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel311_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel312_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel312_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel313_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel313_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel314_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel314_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel320_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel320_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel321_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel321_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel322_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel322_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel323_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel323_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel324_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel324_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel330_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel330_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel331_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel331_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel332_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel332_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel333_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel333_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel334_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel334_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel400_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel400_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel410_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel410_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel420_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel420_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel430_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel430_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel_c_adress.c | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel_c_adress.h | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kerneltype.h diff1 | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nonbonded.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/tpxio.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/trxio.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/txtdump.c diff1 | | blob | history
src/gromacs/gmxlib/vmddlopen.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/vmdio.c diff1 | diff2 | blob | history
src/gromacs/gmxpreprocess/readadress.c | diff2 | blob | history
src/gromacs/gmxpreprocess/readir.c diff1 | diff2 | blob | history
src/gromacs/gmxpreprocess/readir.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/force.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/mdebin.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/names.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/nonbonded.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/types/enums.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/types/forcerec.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/types/inputrec.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/types/mdatom.h diff1 | diff2 | blob | history
src/gromacs/mdlib/adress.c | diff2 | blob | history
src/gromacs/mdlib/adress.h | diff2 | blob | history
src/gromacs/mdlib/forcerec.c diff1 | diff2 | blob | history
src/gromacs/mdlib/mdatom.c diff1 | diff2 | blob | history
src/gromacs/mdlib/mdebin.c diff1 | | blob | history
src/gromacs/mdlib/ns.c diff1 | | blob | history
src/gromacs/mdlib/sim_util.c diff1 | | blob | history
src/gromacs/mdlib/tables.c diff1 | diff2 | blob | history
src/programs/gmxcheck/tpbcmp.c diff1 | diff2 | blob | history
src/programs/grompp/grompp.c diff1 | diff2 | blob | history
src/programs/mdrun/mdrun.c diff1 | | blob | history
src/programs/mdrun/runner.c diff1 | | blob | history
src/tools/gmx_membed.c diff1 | diff2 | blob | history
src/tools/gmx_tune_pme.c diff1 | diff2 | blob | history
Local GROMACS mirror with custom stuff