Merge release-4-6 into release-5-0
authorRoland Schulz <roland@utk.edu>
Mon, 26 May 2014 08:49:25 +0000 (04:49 -0400)
committerMark Abraham <mark.j.abraham@gmail.com>
Tue, 27 May 2014 07:50:27 +0000 (09:50 +0200)
commit074166a7ebad3bc5dc626d1958ec62c936f41ae0
tree6b22c7b1cf0d34c6acd503065504d61484d9e282
parentd708c6b1324168d07c9c1c6c18601d250b62d394
parentd77dddb83f64f0265b8f226ff1061b37bc10877b
Merge release-4-6 into release-5-0

Conflicts:
CMakeLists.txt - fixed use of GMX_CPU_ACCELERATION
src/gromacs/gmxana/gmx_lie.c
src/gromacs/pulling/pull.c

Change-Id: I45a70eee6f7ec4dd922b6c04c740c40f50159a45
CMakeLists.txt
src/gromacs/gmxana/gmx_covar.c
src/gromacs/gmxana/gmx_lie.c
src/gromacs/gmxpreprocess/addconf.c
src/gromacs/gmxpreprocess/grompp.c
src/gromacs/gmxpreprocess/readir.c
src/gromacs/mdlib/forcerec.c
src/gromacs/mdlib/md_support.c
src/gromacs/pulling/pull.c
src/programs/mdrun/md.c