Merge release-5-0 into master
authorRoland Schulz <roland@utk.edu>
Fri, 5 Dec 2014 23:31:17 +0000 (18:31 -0500)
committerRoland Schulz <roland@utk.edu>
Sun, 7 Dec 2014 00:08:19 +0000 (19:08 -0500)
commit5a9dc6db279628d8f4ce39b5f3103dcac05e0dd7
tree66860174745c5619c2c2443686a35e9f242f9089
parent141784b96a4913abb327e40aca00bb7f718be27d
parentd57d91a983307925e95b524896d2441343e4cb8c
Merge release-5-0 into master

Conflicts (trivial):
src/gromacs/gmxlib/gmx_thread_affinity.c
src/gromacs/mdlib/clincs.cpp

Manual changes:
Removed config.h because not necessary anymore:
src/gromacs/mdlib/nbnxn_search_simd_4xn.h
src/gromacs/mdlib/nbnxn_search.c
Removed config.h supression:
docs/doxygen/suppressions.txt
uncrustify:
src/gromacs/mdlib/clincs.cpp

Change-Id: I00064120f12f609fabecac9b3c823d33c015e59c
docs/doxygen/suppressions.txt
src/gromacs/domdec/domdec.cpp
src/gromacs/gmxlib/gmx_thread_affinity.c
src/gromacs/gmxpreprocess/readir.c
src/gromacs/gmxpreprocess/readpull.c
src/gromacs/mdlib/clincs.cpp
src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h
src/gromacs/mdlib/nbnxn_pairlist.h
src/gromacs/mdlib/nbnxn_search.c
src/gromacs/mdlib/nbnxn_search_simd_4xn.h