biod.pnpi.spb.ru / alexxy / gromacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 459577c a61c373)
Merge remote-tracking branch 'gerrit/release-4-6'
authorRoland Schulz <roland@utk.edu>
Fri, 10 Feb 2012 20:40:08 +0000 (15:40 -0500)
committerRoland Schulz <roland@utk.edu>
Fri, 10 Feb 2012 20:40:08 +0000 (15:40 -0500)
commit981dd4fa647368395160912683e8934e860d66bf
treef17b6b25861a9cd1a0fb81473c523174c3935185tree | snapshot
parent459577ce992a3fdcc0ff6f56b568c99b3c82bc07commit | diff
parenta61c3739591ba0418aff53ec86ef0e850ca89b00commit | diff
Merge remote-tracking branch 'gerrit/release-4-6'

Conflicts:
src/gmxlib/CMakeLists.txt

Modified:
src/gromacs/gmxlib/CMakeLists.txt (just comment)

Change-Id: Id019f42f2ccc046173d7ec8d2701f76488a6bdab
47 files changed:
CMakeLists.txt diff1 | diff2 | blob | history
src/gromacs/gmxlib/CMakeLists.txt diff1 | | blob | history
src/gromacs/gmxlib/copyrite.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/filenm.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/futil.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/gmx_fatal.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/gmxfio.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/gmxfio_asc.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/gmxfio_bin.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/gmxfio_int.h diff1 | diff2 | blob | history
src/gromacs/gmxlib/gmxfio_rw.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/gmxfio_xdr.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/libxdrf.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/main.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/network.c diff1 | | blob | history
src/gromacs/gmxlib/oenv.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/shift_util.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/smalloc.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/statutil.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/tcontrol.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/tpxio.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/txtdump.c diff1 | | blob | history
src/gromacs/gmxlib/typedefs.c diff1 | | blob | history
src/gromacs/gmxpreprocess/fflibutil.c diff1 | diff2 | blob | history
src/gromacs/legacyheaders/domdec.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/domdec_network.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/gmx_sort.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/mdrun.h diff1 | | blob | history
src/gromacs/legacyheaders/types/commrec.h diff1 | diff2 | blob | history
src/gromacs/mdlib/domdec.c diff1 | | blob | history
src/gromacs/mdlib/domdec_network.c diff1 | diff2 | blob | history
src/gromacs/mdlib/fft5d.c diff1 | diff2 | blob | history
src/gromacs/mdlib/genborn.c diff1 | diff2 | blob | history
src/gromacs/mdlib/genborn_sse2_double.c diff1 | diff2 | blob | history
src/gromacs/mdlib/genborn_sse2_single.c diff1 | diff2 | blob | history
src/gromacs/mdlib/gmx_fft_fftw3.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_pp.c diff1 | | blob | history
src/gromacs/mdlib/sim_util.c diff1 | | blob | history
src/programs/gmxcheck/tpbcmp.c diff1 | diff2 | blob | history
src/programs/mdrun/md.c diff1 | | blob | history
src/programs/mdrun/md_openmm.c diff1 | | blob | history
src/programs/mdrun/mdrun.c diff1 | | blob | history
src/programs/mdrun/runner.c diff1 | | blob | history
src/tools/gmx_membed.c diff1 | diff2 | blob | history
Local GROMACS mirror with custom stuff