biod.pnpi.spb.ru / alexxy / gromacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7f5b664 7763fa8)
Merge remote-tracking branch 'origin/release-4-6' into HEAD
authorRoland Schulz <roland@utk.edu>
Thu, 25 Oct 2012 18:32:50 +0000 (14:32 -0400)
committerRoland Schulz <roland@utk.edu>
Thu, 25 Oct 2012 18:33:13 +0000 (14:33 -0400)
commita3bec75e4e9e3b6737f88e773c706efcf4cd2af3
treecd047a65205b88d02384d2cab5b9598ea017bc11tree | snapshot
parent7f5b664c9c89b0708b5e4f91273e398f5c83b5d7commit | diff
parent7763fa8fe63171f28387cfa116f02ba40e432079commit | diff
Merge remote-tracking branch 'origin/release-4-6' into HEAD

Conflicts:
include/nbnxn_search.h
src/gromacs/legacyheaders/nbnxn_search.h
src/mdlib/nbnxn_search.h
Moved the new src/mdlib/nbnxn_search.h to
     src/gromacs/mdlib/nbnxn_search.h

Conflicts (all trival):
src/gromacs/gmxlib/statutil.cpp
src/programs/mdrun/genalg.c
src/tools/gmx_h2order.c
src/tools/gmx_sorient.c

Moved src/mdlib/nbnxn_atomdata.* src/mdlib/nbnxn_internal.h
    to src/gromacs/mdlib

Change-Id: Ic0026cb8e9c2b12fcd5293add562e906193bf6ab
27 files changed:
src/gromacs/gmxlib/bondfree.c diff1 | | blob | history
src/gromacs/gmxlib/gmx_omp_nthreads.c diff1 | | blob | history
src/gromacs/legacyheaders/constr.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/gmx_omp_nthreads.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/types/nbnxn_pairlist.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/vsite.h diff1 | diff2 | blob | history
src/gromacs/mdlib/clincs.c diff1 | diff2 | blob | history
src/gromacs/mdlib/constr.c diff1 | | blob | history
src/gromacs/mdlib/csettle.c diff1 | diff2 | blob | history
src/gromacs/mdlib/domdec.c diff1 | | blob | history
src/gromacs/mdlib/domdec_top.c diff1 | | blob | history
src/gromacs/mdlib/force.c diff1 | | blob | history
src/gromacs/mdlib/forcerec.c diff1 | | blob | history
src/gromacs/mdlib/gmx_wallcycle.c diff1 | diff2 | blob | history
src/gromacs/mdlib/nbnxn_atomdata.c | diff2 | blob | history
src/gromacs/mdlib/nbnxn_atomdata.h | diff2 | blob | history
src/gromacs/mdlib/nbnxn_consts.h diff1 | diff2 | blob | history
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh diff1 | diff2 | blob | history
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_legacy.cuh diff1 | diff2 | blob | history
src/gromacs/mdlib/nbnxn_internal.h | diff2 | blob | history
src/gromacs/mdlib/nbnxn_search.c diff1 | diff2 | blob | history
src/gromacs/mdlib/nbnxn_search.h diff1 | diff2 | blob | history
src/gromacs/mdlib/shakef.c diff1 | diff2 | blob | history
src/gromacs/mdlib/sim_util.c diff1 | | blob | history
src/gromacs/mdlib/update.c diff1 | diff2 | blob | history
src/gromacs/mdlib/vsite.c diff1 | diff2 | blob | history
src/programs/mdrun/runner.c diff1 | | blob | history
Local GROMACS mirror with custom stuff