Merge branch 'release-4-6' into master
authorRoland Schulz <roland@utk.edu>
Thu, 27 Jun 2013 07:57:35 +0000 (03:57 -0400)
committerMark Abraham <mark.j.abraham@gmail.com>
Thu, 27 Jun 2013 08:55:30 +0000 (10:55 +0200)
commitcc6daae88401ad68b564de821490da31d49331c2
tree885219d5e166fbc1d521316684c4e01b5fd5fbd5
parentc99ed93b144a0a880699537303521ae96f3e2199
parentff6c68d936c944f45f73f6c921e7ffcab4002092
Merge branch 'release-4-6' into master

Conflicts:
CMakeLists.txt
cmake/ThreadMPI.cmake
src/gromacs/gmxana/calcpot.c
src/gromacs/gmxana/calcpot.h
src/gromacs/legacyheaders/pull_rotation.h
src/tools/CMakeLists.txt

Resolution was straightforward; always in favour of version already in
master branch. Removed calcpot.[ch].

Change-Id: I7ad7a6d9e34f30e04f71c52d707065c6e14b68f3
CMakeLists.txt
src/gromacs/gmxana/gmx_bar.c
src/gromacs/gmxana/gmx_genion.c
src/gromacs/gmxlib/copyrite.c
src/gromacs/gmxlib/gmx_cpuid.c
src/gromacs/gmxlib/gmx_thread_affinity.c
src/gromacs/legacyheaders/gmx_math_x86_sse4_1_double.h
src/gromacs/legacyheaders/gmx_math_x86_sse4_1_single.h
src/gromacs/mdlib/domdec.c
src/programs/mdrun/md.c