biod.pnpi.spb.ru / alexxy / gromacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 899ac8c ed48a3c)
Merge release-5-0 into master
authorTeemu Murtola <teemu.murtola@gmail.com>
Mon, 30 Jun 2014 14:10:49 +0000 (17:10 +0300)
committerTeemu Murtola <teemu.murtola@gmail.com>
Mon, 30 Jun 2014 14:14:50 +0000 (17:14 +0300)
commitf98202503faea52a84a8fd895477fa5173df3c31
treeb092ee32d25d56b56dfa650fcc32174f51bcf554tree | snapshot
parent899ac8c074216c14a5047987219278b2d038d3d7commit | diff
parented48a3ccce9b7b117b1cdda1b226e8e92f99e08ccommit | diff
Merge release-5-0 into master

Conflicts:
CMakeLists.txt (version only)
src/gromacs/fileio/tngio.h (includes only)
src/gromacs/fileio/tngio_for_tools.h (includes only)
src/gromacs/gmxlib/gmx_thread_affinity.c
            (took variable rename from 5.0, other changes from master
             kept)
src/gromacs/gmxpreprocess/hackblock.c (includes only)
src/gromacs/gmxpreprocess/pdb2top.cpp
            (took 5.0 removal of unused parameter)
src/gromacs/mdlib/constr.c (includes only)
src/gromacs/utility/fatalerror.cpp
            (applied similar error message change to basenetwork.cpp)

Change-Id: I7137225e37828a19c4b92aa2ec055e7177aa5676
74 files changed:
CMakeLists.txt diff1 | diff2 | blob | history
src/external/tng_io/src/lib/md5.c diff1 | diff2 | blob | history
src/gromacs/CMakeLists.txt diff1 | diff2 | blob | history
src/gromacs/essentialdynamics/edsam.c diff1 | diff2 | blob | history
src/gromacs/fft/fft5d.cpp diff1 | diff2 | blob | history
src/gromacs/fileio/CMakeLists.txt diff1 | diff2 | blob | history
src/gromacs/fileio/gmxfio.c diff1 | diff2 | blob | history
src/gromacs/fileio/md5.c diff1 | diff2 | blob | history
src/gromacs/fileio/tngio.cpp diff1 | diff2 | blob | history
src/gromacs/fileio/tngio.h diff1 | diff2 | blob | history
src/gromacs/fileio/tngio_for_tools.cpp diff1 | diff2 | blob | history
src/gromacs/fileio/tngio_for_tools.h diff1 | diff2 | blob | history
src/gromacs/fileio/tpxio.c diff1 | diff2 | blob | history
src/gromacs/gmxana/gmx_current.c diff1 | diff2 | blob | history
src/gromacs/gmxana/gmx_hbond.c diff1 | diff2 | blob | history
src/gromacs/gmxana/gmx_make_edi.c diff1 | diff2 | blob | history
src/gromacs/gmxana/gmx_pme_error.cpp diff1 | diff2 | blob | history
src/gromacs/gmxana/gmx_tune_pme.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/bondfree.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/checkpoint.cpp diff1 | diff2 | blob | history
src/gromacs/gmxlib/copyrite.cpp diff1 | diff2 | blob | history
src/gromacs/gmxlib/ewald_util.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/gmx_detect_hardware.cpp diff1 | diff2 | blob | history
src/gromacs/gmxlib/gmx_omp_nthreads.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/gmx_thread_affinity.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/main.cpp diff1 | diff2 | blob | history
src/gromacs/gmxlib/mvdata.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/network.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/nonbonded/nb_free_energy.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/nrnb.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/orires.c diff1 | diff2 | blob | history
src/gromacs/gmxlib/txtdump.c diff1 | diff2 | blob | history
src/gromacs/gmxpreprocess/gen_ad.c diff1 | diff2 | blob | history
src/gromacs/gmxpreprocess/hackblock.c diff1 | diff2 | blob | history
src/gromacs/gmxpreprocess/hackblock.h diff1 | diff2 | blob | history
src/gromacs/gmxpreprocess/pdb2top.cpp diff1 | diff2 | blob | history
src/gromacs/gmxpreprocess/pgutil.c diff1 | diff2 | blob | history
src/gromacs/gmxpreprocess/readir.c diff1 | diff2 | blob | history
src/gromacs/legacyheaders/constr.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/network.h diff1 | diff2 | blob | history
src/gromacs/legacyheaders/types/inputrec.h diff1 | diff2 | blob | history
src/gromacs/mdlib/constr.c diff1 | diff2 | blob | history
src/gromacs/mdlib/domdec.c diff1 | diff2 | blob | history
src/gromacs/mdlib/domdec_con.c diff1 | diff2 | blob | history
src/gromacs/mdlib/domdec_setup.c diff1 | diff2 | blob | history
src/gromacs/mdlib/force.c diff1 | diff2 | blob | history
src/gromacs/mdlib/forcerec.c diff1 | diff2 | blob | history
src/gromacs/mdlib/mdebin.c diff1 | diff2 | blob | history
src/gromacs/mdlib/mdebin_bar.c diff1 | diff2 | blob | history
src/gromacs/mdlib/minimize.c diff1 | diff2 | blob | history
src/gromacs/mdlib/nbnxn_atomdata.c diff1 | diff2 | blob | history
src/gromacs/mdlib/nbnxn_search.c diff1 | diff2 | blob | history
src/gromacs/mdlib/pme.c diff1 | diff2 | blob | history
src/gromacs/mdlib/pme_pp.c diff1 | diff2 | blob | history
src/gromacs/mdlib/qmmm.c diff1 | diff2 | blob | history
src/gromacs/mdlib/shellfc.c diff1 | diff2 | blob | history
src/gromacs/mdlib/sim_util.c diff1 | diff2 | blob | history
src/gromacs/mdlib/tables.c diff1 | diff2 | blob | history
src/gromacs/mdlib/update.c diff1 | diff2 | blob | history
src/gromacs/selection/evaluate.cpp diff1 | diff2 | blob | history
src/gromacs/selection/params.cpp diff1 | diff2 | blob | history
src/gromacs/selection/parsetree.cpp diff1 | diff2 | blob | history
src/gromacs/selection/parsetree.h diff1 | diff2 | blob | history
src/gromacs/selection/selectioncollection.cpp diff1 | diff2 | blob | history
src/gromacs/selection/selelem.h diff1 | diff2 | blob | history
src/gromacs/selection/tests/selectioncollection.cpp diff1 | diff2 | blob | history
src/gromacs/swap/swapcoords.c diff1 | diff2 | blob | history
src/gromacs/timing/wallcycle.c diff1 | diff2 | blob | history
src/gromacs/tools/compare.c diff1 | diff2 | blob | history
src/gromacs/utility/basenetwork.cpp diff1 | | blob | history
src/programs/mdrun/mdrun.cpp diff1 | diff2 | blob | history
src/programs/mdrun/pme_loadbal.c diff1 | diff2 | blob | history
src/programs/mdrun/runner.cpp diff1 | diff2 | blob | history
tests/CppCheck.cmake diff1 | diff2 | blob | history
Local GROMACS mirror with custom stuff