biod.pnpi.spb.ru / alexxy / gromacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d6e3e69 3bd9722)
Merge release-4-6 into master
authorRoland Schulz <roland@utk.edu>
Wed, 4 Jan 2012 10:39:16 +0000 (05:39 -0500)
committerRoland Schulz <roland@utk.edu>
Wed, 4 Jan 2012 15:53:14 +0000 (10:53 -0500)
commit9323cb1d72b2149c829f3436c5278ce80d6b3d5b
tree4c253b1dc2af80d804b432775a9ee113d7e9e986tree | snapshot
parentd6e3e69473b70bfc011d09bc9629ee7398cdc74bcommit | diff
parent3bd9722c1231ec9be33cf1b9c7f7849b7ad167cfcommit | diff
Merge release-4-6 into master

Conflicts:
cmake/gmxCFlags.cmake
src/gromacs/gmxlib/tpxio.c
src/gromacs/legacyheaders/gmx_wallcycle.h
src/gromacs/mdlib/gmx_wallcycle.c
src/gromacs/mdlib/sim_util.c
src/kernel/CMakeLists.txt
src/programs/mdrun/runner.c
src/tools/gmx_tune_pme.c

Moved rotation files to correct folder for 5.0
Fixed double inclusion of openmm in runner.c

Change-Id: I115e47715a4d2980d196e1c75bfbbb595b1201d0
27 files changed:
CMakeLists.txt diff1 | diff2 | blob | history
admin/GerritBuild diff1 | diff2 | blob | history
src/gromacs/gmxlib/copyrite.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/gmx_lapack/dlasq2.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/gmx_lapack/slasq2.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/gmx_sort.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_kernel_bluegene/interaction.h diff1 | diff2 | blob | history
src/gromacs/gmxlib/nrjac.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/thread_mpi/impl.h diff1 | diff2 | blob | history
src/gromacs/gmxlib/tpxio.c diff1 | diff2 | blob | history
src/gromacs/gmxpreprocess/readrot.c diff1 | diff2 | blob | history
src/gromacs/legacyheaders/gmx_wallcycle.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/gstat.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/molfile_plugin.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/thread_mpi/barrier.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/thread_mpi/event.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/thread_mpi/lock.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/thread_mpi/wait.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/vmdplugin.h diff1 | diff2 | blob | history
src/gromacs/mdlib/fft5d.c diff1 | diff2 | blob | history
src/gromacs/mdlib/gmx_fft_fftw3.c diff1 | diff2 | blob | history
src/gromacs/mdlib/gmx_wallcycle.c diff1 | diff2 | blob | history
src/gromacs/mdlib/pull_rotation.c diff1 | | blob | history
src/gromacs/mdlib/sim_util.c diff1 | | blob | history
src/programs/mdrun/repl_ex.c diff1 | diff2 | blob | history
src/programs/mdrun/runner.c diff1 | | blob | history
src/tools/gmx_tune_pme.c diff1 | diff2 | blob | history
Local GROMACS mirror with custom stuff