biod.pnpi.spb.ru / alexxy / gromacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1970643 e715ad2)
Merge release-4-5-patches into release-4-6
authorRoland Schulz <roland@utk.edu>
Fri, 1 Jun 2012 06:24:10 +0000 (02:24 -0400)
committerRoland Schulz <roland@utk.edu>
Fri, 1 Jun 2012 06:49:08 +0000 (02:49 -0400)
commitbe6f36b4534e6b13837201d1c565d4d25d341c3f
treecff6a76b46700904dab66a9d01823ec61a3bfe91tree | snapshot
parent1970643e746af70b31e4c12722ddc16225d5fa33commit | diff
parente715ad2e6e991aab2f6a3d7f783d10d557a783b4commit | diff
Merge release-4-5-patches into release-4-6

Changes in 4.5 for removed lines/files in 4.6:
Makefile.am
include/domdec.h
include/domdec_network.h

Trivial conflict:
include/types/commrec.h

Fixed GMX_THREADS into GMX_THREAD_MPI for those added in 4.5 in:
        include/mdrun.h
        src/gmxlib/shift_util.c
        src/mdlib/gmx_fft_fftw3.c

Change-Id: Id37bfbbacc945a7cf184fa21313c05e2680e1fba
include/mdrun.h diff1 | diff2 | blob | history
include/types/commrec.h diff1 | diff2 | blob | history
src/gmxlib/shift_util.c diff1 | diff2 | blob | history
src/gmxlib/tpxio.c diff1 | diff2 | blob | history
src/kernel/md.c diff1 | diff2 | blob | history
src/mdlib/CMakeLists.txt diff1 | diff2 | blob | history
src/mdlib/gmx_fft_fftw3.c diff1 | diff2 | blob | history
src/tools/gmx_anaeig.c diff1 | diff2 | blob | history
src/tools/gmx_density.c diff1 | diff2 | blob | history
src/tools/gmx_editconf.c diff1 | diff2 | blob | history
Local GROMACS mirror with custom stuff