Merge release-5-0 into master
authorRoland Schulz <roland@utk.edu>
Tue, 3 Jun 2014 15:06:20 +0000 (11:06 -0400)
committerRoland Schulz <roland@utk.edu>
Tue, 3 Jun 2014 15:06:20 +0000 (11:06 -0400)
commitc21e1898c538a86bcad28d7c587908196d29c96f
tree97afa0aa743f4aaf6b56c8ce51030e1099302224
parent033fbf068ba9c57526ec48da8bda54db077146d1
parent3a9590f9f4ca98870a41162f51d331b206ea3ed6
Merge release-5-0 into master

Conflicts:
share/top/gurgle.dat

Change-Id: I95bb9d2ce43ed7fdfe6cfd535e4f88fac9dfb5ea
CMakeLists.txt
share/top/gurgle.dat
src/gromacs/gmxana/gmx_trjconv.c
src/gromacs/gmxpreprocess/topio.c
src/gromacs/mdlib/coupling.c
src/gromacs/tools/dump.c