| commit | 73eb6fd38236ec350495096244e82ca44f873561 | |
| author | Roland Schulz <roland@utk.edu> | |
| Fri, 9 May 2014 19:08:58 +0000 (9 15:08 -0400) | ||
| committer | Roland Schulz <roland@utk.edu> | |
| Sat, 10 May 2014 16:33:06 +0000 (10 12:33 -0400) | ||
| tree | d34b8e45b52350a0b3e4845675a992b1e5483a76 | treesnapshot (tar.gz zip) |
| parent | 813e75830d7d28e3b1639f7ca5eecc38081b2154 | commitdiff |
| parent | 6d194ee7b4b81113059086493caf6ed28ccf70a5 | commitdiff |
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
Conflicts:
CMakeLists.txt (applied to cmake/gmxManageSharedLibraries.cmake)
Replaced gmx_llabs by llabs as mentioned in TODO.
Change-Id: I37e8cf5d6725cc9836e6dc29ca44e7ef915417c4