Merge branch release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Sat, 9 May 2015 20:42:50 +0000 (22:42 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Sat, 9 May 2015 20:47:07 +0000 (22:47 +0200)
commit6257eed7a81c5c311de762fe26c2f6e9538dff34
treec98417e1abf09ccbdc3a466890215f4186600f49
parent7011af79f53f0ee74379e7465f0168539adedd87
parent7d62d8f604036e5a062c6ea25be715f0e50a50c9
Merge branch release-5-0

Conflicts:
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu

Trivial conflict; resolved preserving both the name change from cu_nb
to nb in master, and bug fix incoming from release-4-6 via
release-5-0.

Bumped copyright headers on BG/Q Platform files

Change-Id: Ie9dc6e674e8ab9b27716cf6d1b7bc5e779ea1bea
cmake/Platform/BlueGeneQ-static-XL-C.cmake
cmake/Platform/BlueGeneQ-static-XL-CXX.cmake
src/gromacs/gmxana/gmx_trjconv.c
src/gromacs/gmxpreprocess/readir.c
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu
src/gromacs/mdlib/sim_util.cpp
src/gromacs/simd/impl_x86_avx_128_fma/impl_x86_avx_128_fma.h
src/gromacs/trajectoryanalysis/tests/angle.cpp
src/gromacs/utility/futil.cpp
src/programs/mdrun/repl_ex.cpp