Public Git Hosting - gromacs/AngularHB.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 4cd9198 36035fb)

commit	0e9f664b985abfb43af63695978382539473162c
author	Mark Abraham <mark.j.abraham@gmail.com>
	Thu, 14 Apr 2016 09:23:52 +0000 (14 11:23 +0200)
committer	Mark Abraham <mark.j.abraham@gmail.com>
	Thu, 14 Apr 2016 10:04:52 +0000 (14 12:04 +0200)
tree	df62ef1bab9fa6d5499222b7b94ca23e1e6cfa9c	tree \| snapshot (tar.gz zip)
parent	4cd9198e5505190328276f96c2887f38edc2cfe9	commit \| diff
parent	36035fb031565bd2e938e6d7db304f7a7e2a9046	commit \| diff

Merge branch release-5-1

Several changes from release-5-1 have been fixed separately
in master, such changes are omitted here.

Change-Id: Ib03a2091ad6f76e785f7a6cc9ea91493d246da3b

19 files changed:

cmake/gmxManageGPU.cmake	diff1 \|	diff2 \|	blob \| history
docs/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
docs/manual/forcefield.tex	diff1 \|	diff2 \|	blob \| history
src/gromacs/correlationfunctions/autocorr.cpp	diff1 \|	\|	blob \| history
src/gromacs/correlationfunctions/manyautocorrelation.cpp	diff1 \|	\|	blob \| history
src/gromacs/correlationfunctions/tests/autocorr.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/ewald/pme-load-balancing.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/gmx_dielectric.cpp	diff1 \|	\|	blob \| history
src/gromacs/gmxpreprocess/readir.cpp	diff1 \|	\|	blob \| history
src/gromacs/gmxpreprocess/toppush.cpp	diff1 \|	\|	blob \| history
src/gromacs/mdlib/constr.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/coupling.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.cpp	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.cpp	diff1 \|	\|	blob \| history
src/gromacs/mdlib/sim_util.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/wall.cpp	diff1 \|	\|	blob \| history
src/gromacs/simd/impl_ibm_vmx/impl_ibm_vmx.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/utility/datafilefinder.cpp	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/runner.cpp	diff1 \|	diff2 \|	blob \| history