Merge branch release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 15 Jan 2015 10:15:57 +0000 (11:15 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Thu, 15 Jan 2015 10:21:48 +0000 (11:21 +0100)
commit8e210917852fc925ad72733a6ff2df005ed8292c
tree0f082f361e850c532e2e6034b4e17c64448b017f
parentef9dba0d81161858c42b2aabc5d0bd76df1637e0
parent78ae40d47bee7ce9b0f35109c45570f6ed973b75
Merge branch release-5-0

Conflicts:
src/programs/mdrun/md.cpp
Deletion in release-5-0 while fixing md-vv allocation bug was in the
same place as deletion in master when removing integrator iteration.
Resolved by deleting both.

Uncrustified and bumped copyright years.

Change-Id: If605ab0b406f81297acd3bd7ead0b4bde38d54d3
cmake/gmxCFlags.cmake
src/gromacs/domdec/domdec.cpp
src/gromacs/domdec/domdec_box.cpp
src/gromacs/gmxlib/copyrite.cpp
src/gromacs/mdlib/nbnxn_search.c
src/programs/mdrun/md.cpp