Merge release-5-0 into master
authorRoland Schulz <roland@utk.edu>
Wed, 10 Sep 2014 04:16:09 +0000 (00:16 -0400)
committerRoland Schulz <roland@utk.edu>
Wed, 10 Sep 2014 04:20:34 +0000 (00:20 -0400)
Conflicts:
CMakeLists.txt
only version changes not needed in master
src/gromacs/utility/gmxassert.h
better fix already in master

Change-Id: I8af70d807972758149e9f69b420d528269e9bebd

1  2 
src/gromacs/gmxpreprocess/readir.c
src/gromacs/mdlib/domdec.c

Simple merge
Simple merge