biod.pnpi.spb.ru / alexxy / gromacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c5cb103 385e1b4)
Merge release-4-6 into master
authorRoland Schulz <roland@utk.edu>
Wed, 13 Feb 2013 21:01:16 +0000 (16:01 -0500)
committerRoland Schulz <roland@utk.edu>
Wed, 13 Feb 2013 21:01:16 +0000 (16:01 -0500)
commit0c77aae90fbf9e0528d017cae45179a9a9982acf
tree9b7d5c47d9f930e6215b57ae6665dc0d4628a038tree | snapshot
parentc5cb103584f8046d87ec0b72417f51c57f2e32fccommit | diff
parent385e1b46b2886c5c09a8a3e4b36806b5f486b264commit | diff
Merge release-4-6 into master

Conflicts (all trivial):
        CMakeLists.txt
        admin/mkhtml
        share/template/CMakeLists.txt
        src/gromacs/gmxlib/nonbonded/nb_generic_adress.c
        src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_template_avx_256_double.pre

Manual changes:
        CMakeLists.txt: Reverted change to CPACK_PACKAGE_VERSION_PATCH

Change-Id: Ib38fbbdd5d3d7e531d4e1db0229d6305b84bbd6b
20 files changed:
CMakeLists.txt diff1 | diff2 | blob | history
admin/mkhtml diff1 | diff2 | blob | history
share/html/online.html diff1 | diff2 | blob | history
share/html/online/getting_started.html diff1 | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_generic_adress.c diff1 | | blob | history
src/gromacs/gmxlib/nonbonded/nb_generic_cg.c diff1 | | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_256_double.c diff1 | | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_256_double.c diff1 | | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_256_double.c diff1 | | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_template_avx_256_double.pre diff1 | | blob | history
src/gromacs/gmxlib/nrnb.c diff1 | | blob | history
src/gromacs/gmxpreprocess/readir.c diff1 | | blob | history
src/gromacs/legacyheaders/types/nrnb.h diff1 | | blob | history
src/gromacs/mdlib/forcerec.c diff1 | | blob | history
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu diff1 | | blob | history
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu diff1 | | blob | history
src/gromacs/mdlib/nbnxn_internal.h diff1 | | blob | history
src/gromacs/mdlib/nbnxn_search.c diff1 | | blob | history
src/gromacs/mdlib/ns.c diff1 | | blob | history
src/gromacs/mdlib/pull_rotation.c diff1 | | blob | history
Local GROMACS mirror with custom stuff