BioD PNPI Git Repos - alexxy/gromacs.git/commit

biod.pnpi.spb.ru / alexxy / gromacs.git / commit

author	Roland Schulz <roland@utk.edu>
	Wed, 3 Sep 2014 17:47:25 +0000 (13:47 -0400)
committer	Roland Schulz <roland@utk.edu>
	Wed, 3 Sep 2014 22:10:20 +0000 (18:10 -0400)
commit	a786c5005ab7b72a13b5c55e9f98d750670b2e87
tree	f4d0c3601a504aba9f14081fb886f8cb6f77e998	tree \| snapshot
parent	f62a0e6795372dba0b6dc851fa736980bfd2195c	commit \| diff
parent	af78f4c5ce6924e1b7ee6fa65fa0b462df4d76a5	commit \| diff

Merge release-5-0 into master

Conflicts:
cmake/gmxDetectSimd.cmake
cmake/gmxSetBuildInformation.cmake
share/template/cmake/FindGROMACS.cmakein
change superseded in master
src/gromacs/fileio/mdoutf.h
src/gromacs/gmxlib/network.c
src/gromacs/gmxlib/oenv.cpp
src/gromacs/legacyheaders/types/simple.h
change applied to
src/gromacs/utility/real.h

Change-Id: Ib076dc9894f0d590a243a7504c3db7daf2f72beb

33 files changed:

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/gmxCFlags.cmake	diff1 \|	diff2 \|	blob \| history
cmake/gmxDetectSimd.cmake	diff1 \|	diff2 \|	blob \| history
cmake/gmxSetBuildInformation.cmake	diff1 \|	diff2 \|	blob \| history
docs/install-guide/install-guide.md	diff1 \|	diff2 \|	blob \| history
src/config.h.cmakein	diff1 \|	diff2 \|	blob \| history
src/gromacs/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/mdoutf.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/mdoutf.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/tngio.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/tngio_for_tools.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/trajectory_writing.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/trajectory_writing.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/gmx_bar.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/gmx_covar.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/gmx_wham.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/legacytests/gmx_traj_tests.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/copyrite.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/oenv.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/calc_verletbuf.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/sim_util.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/vsite.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/domdec.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/minimize.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/pme.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/sim_util.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/vsite.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/utility/basenetwork.cpp	diff1 \|	\|	blob \| history
src/gromacs/utility/real.h	diff1 \|	\|	blob \| history
src/gromacs/utility/smalloc.c	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/md.cpp	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/tests/rerun.cpp	diff1 \|	diff2 \|	blob \| history
src/testutils/tests/testasserts_tests.cpp	diff1 \|	diff2 \|	blob \| history

Local GROMACS mirror with custom stuff

RSS Atom

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/gmxCFlags.cmake	diff1 \|	diff2 \|	blob \| history
cmake/gmxDetectSimd.cmake	diff1 \|	diff2 \|	blob \| history
cmake/gmxSetBuildInformation.cmake	diff1 \|	diff2 \|	blob \| history
docs/install-guide/install-guide.md	diff1 \|	diff2 \|	blob \| history
src/config.h.cmakein	diff1 \|	diff2 \|	blob \| history
src/gromacs/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/mdoutf.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/mdoutf.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/tngio.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/tngio_for_tools.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/trajectory_writing.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/trajectory_writing.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/gmx_bar.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/gmx_covar.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/gmx_wham.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/legacytests/gmx_traj_tests.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/copyrite.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/oenv.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/calc_verletbuf.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/sim_util.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/vsite.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/domdec.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/minimize.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/pme.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/sim_util.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/vsite.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/utility/basenetwork.cpp	diff1 \|	\|	blob \| history
src/gromacs/utility/real.h	diff1 \|	\|	blob \| history
src/gromacs/utility/smalloc.c	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/md.cpp	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/tests/rerun.cpp	diff1 \|	diff2 \|	blob \| history
src/testutils/tests/testasserts_tests.cpp	diff1 \|	diff2 \|	blob \| history