| commit | 940c34d88869760647c74d664801e9101b0f70d0 | |
| author | Roland Schulz <roland@utk.edu> | |
| Fri, 5 Jun 2015 18:15:33 +0000 (5 14:15 -0400) | ||
| committer | Roland Schulz <roland@utk.edu> | |
| Fri, 5 Jun 2015 18:15:42 +0000 (5 14:15 -0400) | ||
| tree | 1f7a9a1c00da1f61067da7717e5860471c64c3b3 | treesnapshot (tar.gz zip) |
| parent | c6a6c79b1070c9536d42b8407d98b1d6f8e3e512 | commitdiff |
| parent | 31cc5ae98345cbc1039915ac383a5ef5a567a1b0 | commitdiff |
Merge release-5-0 into master
Conflicts:
src/gromacs/gmxlib/rbin.c
(added also ICC16)
src/gromacs/mdlib/tpi.cpp
(gmx_simd_check_and_reset_overflow was removed already
in master branch, so no changes needed here)
src/programs/mdrun/runner.cpp
(adjacent additions)
Change-Id: I85d92bce71ebeb6e38ac63bb61c3931d5bb54c16
Conflicts:
src/gromacs/gmxlib/rbin.c
(added also ICC16)
src/gromacs/mdlib/tpi.cpp
(gmx_simd_check_and_reset_overflow was removed already
in master branch, so no changes needed here)
src/programs/mdrun/runner.cpp
(adjacent additions)
Change-Id: I85d92bce71ebeb6e38ac63bb61c3931d5bb54c16