Merge release-4-6 into master
authorRoland Schulz <roland@utk.edu>
Sun, 3 Jun 2012 15:45:26 +0000 (11:45 -0400)
committerRoland Schulz <roland@utk.edu>
Sun, 3 Jun 2012 15:45:26 +0000 (11:45 -0400)
commit1c6a7753a28feb5c3d2b03df648ac3e65741564e
tree0aaa79b55ec961fd591e63df15b1ee51aaad5f06
parente4c4182a36e6582f7bd4f646127d00d4f697667b
parentbe6f36b4534e6b13837201d1c565d4d25d341c3f
Merge release-4-6 into master

Conflicts:
src/mdlib/CMakeLists.txt
          change applied to src/gromacs/mdlib/CMakeLists.txt
src/tools/gmx_tune_pme.c
  trivial conflict

Moved:
src/mdlib/fftpack.c & src/mdlib/fftpack.h to src/external/fftpack

Fixed paths in COPYING-OTHER and added boost and gtest/gmock.

Moved the copyright header and list of modifications from fftpack.c into
new README file. Reduces modifications to original file.

Fixed header location in src/gromacs/mdlib/gmx_fft_fftpack.c.

Added macros.h to g_tune_pme (fixing missing min/max)

Change-Id: I9324b1695412e21d16bdcb4d2dc316c53356da5f
23 files changed:
CMakeLists.txt
COPYING-OTHER
src/external/fftpack/README
src/external/fftpack/fftpack.c
src/external/fftpack/fftpack.h
src/gromacs/gmxlib/shift_util.c
src/gromacs/gmxlib/thread_mpi/numa_malloc.c
src/gromacs/gmxlib/tpxio.c
src/gromacs/gmxlib/vmdio.c
src/gromacs/gmxlib/vmdio.h
src/gromacs/legacyheaders/domdec.h
src/gromacs/legacyheaders/domdec_network.h
src/gromacs/legacyheaders/mdrun.h
src/gromacs/legacyheaders/types/commrec.h
src/gromacs/legacyheaders/vec.h
src/gromacs/mdlib/CMakeLists.txt
src/gromacs/mdlib/gmx_fft_fftpack.c
src/gromacs/mdlib/gmx_fft_fftw3.c
src/programs/mdrun/md.c
src/tools/gmx_anaeig.c
src/tools/gmx_density.c
src/tools/gmx_editconf.c
src/tools/gmx_tune_pme.c