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

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

author	Teemu Murtola <teemu.murtola@gmail.com>
	Wed, 20 Aug 2014 18:03:25 +0000 (21:03 +0300)
committer	Teemu Murtola <teemu.murtola@gmail.com>
	Wed, 20 Aug 2014 18:04:55 +0000 (21:04 +0300)
commit	b53fe549cf7fbb7fdd61ed5efd4e1c4e312c3879
tree	ff535cd95b1b9665e1f4cd2030f10c572f91bd55	tree \| snapshot
parent	a2364f4f05c2efe487e1a12015fb2bae8a217d5f	commit \| diff
parent	bad36c3375184c304bad2d1cff7801415e1b4dbd	commit \| diff

Merge release-5-0 into master

Conflicts:
  src/gromacs/legacyheaders/types/simple.h
    - applied gmx_unused change to basedefinitions.h
  src/gromacs/mdlib/sim_util.c
    - took adjacent changes from both branches

Change-Id: I42071be546015ede33b03a34ef0d95a5d5a3b09e

32 files changed:

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
install-guide/install-guide.md	diff1 \|	diff2 \|	blob \| history
src/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/config.h.cmakein	diff1 \|	diff2 \|	blob \| history
src/gromacs/analysisdata/tests/analysisdata.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/analysisdata/tests/histogram.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/fft/fft5d.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/tngio.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/gmx_tune_pme.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/gmx_omp_nthreads.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/inputrec.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/sim_util.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/update.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/pulling/pull.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/pulling/pullutil.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/scanner.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/scanner.l	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/scanner_flex.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/scanner_internal.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/selelem.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/sm_compare.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/tests/nbsearch.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/simd/tests/simd4_math.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/simd/tests/simd_math.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/timing/cyclecounter.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/timing/wallcycle.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/timing/wallcycle.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/utility/basedefinitions.h	diff1 \|	\|	blob \| history
src/programs/mdrun/md.cpp	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/tests/moduletest.cpp	diff1 \|	diff2 \|	blob \| history

Local GROMACS mirror with custom stuff

RSS Atom

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
install-guide/install-guide.md	diff1 \|	diff2 \|	blob \| history
src/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/config.h.cmakein	diff1 \|	diff2 \|	blob \| history
src/gromacs/analysisdata/tests/analysisdata.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/analysisdata/tests/histogram.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/fft/fft5d.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/tngio.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/gmx_tune_pme.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/gmx_omp_nthreads.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/inputrec.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/sim_util.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/update.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/pulling/pull.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/pulling/pullutil.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/scanner.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/scanner.l	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/scanner_flex.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/scanner_internal.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/selelem.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/sm_compare.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/tests/nbsearch.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/simd/tests/simd4_math.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/simd/tests/simd_math.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/timing/cyclecounter.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/timing/wallcycle.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/timing/wallcycle.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/utility/basedefinitions.h	diff1 \|	\|	blob \| history
src/programs/mdrun/md.cpp	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/tests/moduletest.cpp	diff1 \|	diff2 \|	blob \| history