Merge release-4-6 into release-5-0
authorRoland Schulz <roland@utk.edu>
Fri, 9 May 2014 19:08:58 +0000 (15:08 -0400)
committerRoland Schulz <roland@utk.edu>
Sat, 10 May 2014 16:33:06 +0000 (12:33 -0400)
commit73eb6fd38236ec350495096244e82ca44f873561
treed34b8e45b52350a0b3e4845675a992b1e5483a76
parent813e75830d7d28e3b1639f7ca5eecc38081b2154
parent6d194ee7b4b81113059086493caf6ed28ccf70a5
Merge release-4-6 into release-5-0

Conflicts:
CMakeLists.txt (applied to cmake/gmxManageSharedLibraries.cmake)

Replaced gmx_llabs by llabs as mentioned in TODO.

Change-Id: I37e8cf5d6725cc9836e6dc29ca44e7ef915417c4
cmake/gmxManageSharedLibraries.cmake
src/gromacs/fileio/libxdrf.c
src/gromacs/gmxana/geminate.c
src/gromacs/gmxana/gmx_anaeig.c
src/gromacs/gmxana/gmx_current.c
src/gromacs/gmxana/gmx_mindist.c
src/gromacs/gmxana/gmx_rms.c
src/gromacs/gmxana/gmx_xpm2ps.c