?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 4d02eb4 0966d9f)
Merge branch 'release-4-6'
commit7f5b664c9c89b0708b5e4f91273e398f5c83b5d7
authorRoland Schulz <roland@utk.edu>
Fri, 19 Oct 2012 18:50:56 +0000 (19 14:50 -0400)
committerRoland Schulz <roland@utk.edu>
Fri, 19 Oct 2012 19:22:32 +0000 (19 15:22 -0400)
treefc7556c71ed74e0fdf8da21b20fa797d377a5fbetree | snapshot (tar.gz zip)
parent4d02eb4db252e4e001996306d4adb6fd852834a0commit | diff
parent0966d9f453f6a8ddd625cd859ebe18bb89838196commit | diff
Merge branch 'release-4-6'

Conflicts:
src/kernel/CMakeLists.txt (applied to programs/mdrun)
src/programs/mdrun/pme_switch.c (renamed)
src/programs/mdrun/pme_switch.h (renamed)

Change-Id: I0914b274baed69a25736dca50b57d1b8658d4ca8
16 files changed:
src/gromacs/gmxlib/thread_mpi/pthreads.c diff1 |  diff2 |  blob | history
src/gromacs/gmxlib/thread_mpi/pthreads.h diff1 |  diff2 |  blob | history
src/gromacs/gmxlib/thread_mpi/tmpi_init.c diff1 |  diff2 |  blob | history
src/gromacs/gmxlib/thread_mpi/winthreads.c diff1 |  diff2 |  blob | history
src/gromacs/gmxlib/thread_mpi/winthreads.h diff1 |  diff2 |  blob | history
src/gromacs/legacyheaders/nbnxn_cuda_data_mgmt.h diff1 |  diff2 |  blob | history
src/gromacs/legacyheaders/thread_mpi/threads.h diff1 |  diff2 |  blob | history
src/gromacs/legacyheaders/thread_mpi/tmpi.h diff1 |  diff2 |  blob | history
src/gromacs/mdlib/clincs.c diff1 |  diff2 |  blob | history
src/gromacs/mdlib/gmx_wallcycle.c diff1 |  diff2 |  blob | history
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu diff1 |  diff2 |  blob | history
src/programs/mdrun/CMakeLists.txt diff1 |   |  blob | history
src/programs/mdrun/md.c diff1 |   |  blob | history
src/programs/mdrun/pme_loadbal.c  |   |  blob
src/programs/mdrun/pme_loadbal.h  |  diff2 |  blob | history
src/programs/mdrun/runner.c diff1 |   |  blob | history
The ultimate molecular dynamics simulation package