Merge release-4-5-patches into release-4-6
authorRoland Schulz <roland@utk.edu>
Sat, 3 Nov 2012 19:31:12 +0000 (15:31 -0400)
committerRoland Schulz <roland@utk.edu>
Sat, 3 Nov 2012 19:31:12 +0000 (15:31 -0400)
commit86b5c2cd3ba3bd004e1f0ba2552aa8751cf6be67
tree23d67e51abc9475dc6d638d12f3f7e88a99ed54b
parent08b30fa71a0ca5b04fb90d49da6ea27aa2cb6500
parentb28537ebbc4e4d228271b9cc378e193044104a95
Merge release-4-5-patches into release-4-6

Conflicts:
cmake/gmxTestLargeFiles.cmake

Change-Id: I104448f48be0c7b3cd5daa1b5cede3cb9d7f672d
CMakeLists.txt
cmake/gmxTestLargeFiles.cmake
include/xdrf.h
src/gmxlib/libxdrf.c
src/tools/gmx_trjcat.c
src/tools/gmx_tune_pme.c