Merge release-4-6 into master
authorRoland Schulz <roland@utk.edu>
Thu, 9 Jan 2014 18:48:12 +0000 (13:48 -0500)
committerRoland Schulz <roland@utk.edu>
Thu, 9 Jan 2014 19:03:24 +0000 (14:03 -0500)
commit00638ed3313bcf7cd5ebe37f807b7c62b858622a
tree460c08ba763521965e306df669ba51c16ad8b8b7
parentd28336a2591a905177a5e635f76189658f66aeff
parent765e6ad9f6b996c3ba572cfaa6dc71f396ef0cad
Merge release-4-6 into master

Conflicts:
src/gromacs/gmxlib/checkpoint.c
src/kernel/genalg.c
src/programs/mdrun/md.c
             (moved change to trajectory_writing.c)

Change-Id: Ia9c8722c7fb80d48d8e40cec2af0cb93dc7e468e
15 files changed:
CMakeLists.txt
src/config.h.cmakein
src/contrib/fftw/CMakeLists.txt
src/gromacs/fileio/futil.cpp
src/gromacs/fileio/trajectory_writing.c
src/gromacs/gmxlib/checkpoint.c
src/gromacs/gmxlib/copyrite.cpp
src/gromacs/gmxlib/gmx_detect_hardware.c
src/gromacs/gmxlib/main.cpp
src/gromacs/gmxlib/string2.c
src/gromacs/gmxlib/thread_mpi/impl.h
src/gromacs/gmxlib/thread_mpi/p2p_buffer.c
src/gromacs/gmxlib/thread_mpi/pthreads.c
src/gromacs/legacyheaders/main.h
src/programs/mdrun/runner.c