biod.pnpi.spb.ru / alexxy / gromacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a7f8c68 0fd439d)
Merge remote-tracking branch 'gerrit/release-4-6' into master
authorRoland Schulz <roland@utk.edu>
Sat, 4 Feb 2012 18:26:42 +0000 (13:26 -0500)
committerRoland Schulz <roland@utk.edu>
Sat, 4 Feb 2012 18:29:36 +0000 (13:29 -0500)
commit5ee972534dc091d35e5b77d41cff97dff014128e
treef154b4dad30a044638d699725d9d3770644e15fdtree | snapshot
parenta7f8c6823a38e9c52ef32032203c36976cabd189commit | diff
parent0fd439d085ef7fdd8fe805790d7126cb912155b5commit | diff
Merge remote-tracking branch 'gerrit/release-4-6' into master

Conflicts:
src/gromacs/mdlib/pme.c
src/programs/mdrun/runner.c
src/tools/CMakeLists.txt

Renamed:
   src/mdlib/pme_sse_single.h -> src/gromacs/mdlib/pme_sse_single.h

Modified:
   src/tools/gmx_dyecoupl.c

Change-Id: Ib4bcf839427908736d9bf529075e1c4def3d68ef
43 files changed:
CMakeLists.txt diff1 | diff2 | blob | history
cmake/ThreadMPI.cmake diff1 | diff2 | blob | history
cmake/gmxCFlags.cmake diff1 | diff2 | blob | history
src/gromacs/gmxlib/bondfree.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/calcgrid.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/copyrite.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/ifunc.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/network.c diff1 | | blob | history
src/gromacs/gmxlib/nrnb.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/thread_mpi/pthreads.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/tpxio.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/txtdump.c diff1 | | blob | history
src/gromacs/gmxpreprocess/pgutil.c diff1 | diff2 | blob | history
src/gromacs/gmxpreprocess/pgutil.h diff1 | diff2 | blob | history
src/gromacs/gmxpreprocess/readir.c diff1 | diff2 | blob | history
src/gromacs/gmxpreprocess/resall.c diff1 | diff2 | blob | history
src/gromacs/gmxpreprocess/topdirs.c diff1 | diff2 | blob | history
src/gromacs/gmxpreprocess/toppush.c diff1 | diff2 | blob | history
src/gromacs/legacyheaders/bondf.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/gmx_ana.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/gmx_parallel_3dfft.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/gmx_wallcycle.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/network.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/pme.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/thread_mpi/atomic/gcc_x86.h diff1 | | blob | history
src/gromacs/legacyheaders/types/idef.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/types/nrnb.h diff1 | diff2 | blob | history
src/gromacs/mdlib/fft5d.c diff1 | diff2 | blob | history
src/gromacs/mdlib/fft5d.h diff1 | diff2 | blob | history
src/gromacs/mdlib/forcerec.c diff1 | diff2 | blob | history
src/gromacs/mdlib/gmx_parallel_3dfft.c diff1 | diff2 | blob | history
src/gromacs/mdlib/gmx_wallcycle.c diff1 | diff2 | blob | history
src/gromacs/mdlib/pme.c diff1 | | blob | history
src/gromacs/mdlib/pme_sse_single.h | diff2 | blob | history
src/gromacs/mdlib/shellfc.c diff1 | | blob | history
src/gromacs/mdlib/update.c diff1 | diff2 | blob | history
src/programs/gmxcheck/tpbcmp.c diff1 | diff2 | blob | history
src/programs/grompp/convparm.c diff1 | diff2 | blob | history
src/programs/mdrun/md.c diff1 | | blob | history
src/programs/mdrun/runner.c diff1 | | blob | history
src/tools/CMakeLists.txt diff1 | diff2 | blob | history
src/tools/gmx_dyecoupl.c | diff2 | blob | history
src/tools/gmx_membed.c diff1 | diff2 | blob | history
Local GROMACS mirror with custom stuff