Merge release-4-6 into master
authorRoland Schulz <roland@utk.edu>
Tue, 31 Dec 2013 00:18:23 +0000 (19:18 -0500)
committerRoland Schulz <roland@utk.edu>
Wed, 1 Jan 2014 02:17:20 +0000 (21:17 -0500)
commit865485855a8fd6a48171e066834fb251f85e7406
tree7d0adc3c3d2c8a0d62294ec4ba529485c0a538d7
parentfdeca4a9bea571714f16712d34f873bdafd94d42
parented04865c0994b5be50bf09c836496a1f1db9af28
Merge release-4-6 into master

Conflicts:
Only version:
CMakeLists.txt
admin/installguide/installguide.tex
share/html/online/mdp_opt.html
Other:
admin/mkhtml (deleted in master)
cmake/gmxCFlags.cmake (gcc 4.8 change ignored)

Changes other than conflicts:
        src/gromacs/gmxlib/gmx_detect_hardware.c (fix compile errors)

Change-Id: Id5845638857fd84ffaeac618d5286a2d23967f7f
src/contrib/fftw/CMakeLists.txt
src/gromacs/gmxana/gmx_make_edi.c
src/gromacs/gmxlib/gmx_detect_hardware.c
src/gromacs/mdlib/edsam.c