Merge release-4-6 into release-5-0
authorRoland Schulz <roland@utk.edu>
Fri, 27 Jun 2014 23:22:28 +0000 (19:22 -0400)
committerRoland Schulz <roland@utk.edu>
Fri, 27 Jun 2014 23:22:28 +0000 (19:22 -0400)
commit73006fec155234f1fb74460233eff330acec509c
tree14a4b44ea35e33008c0a2f0b45b15d0fe2e019d2
parent0e80bfd460b0faa686b3723e36852cbde0f859d0
parent4da7409eb53bfbfcc2e56a128612cce475ffec6e
Merge release-4-6 into release-5-0

Conflicts:
CMakeLists.txt
share/top/oplsaa.ff/watermodels.dat
src/gromacs/fileio/trxio.c
src/gromacs/gmxana/anadih.c
src/gromacs/gmxana/gmx_chi.c
src/gromacs/gmxana/gmx_tcaf.c
src/gromacs/gmxlib/checkpoint.c
src/gromacs/legacyheaders/tables.h
src/gromacs/mdlib/shellfc.c
src/gromacs/mdlib/tables.c
src/gromacs/pulling/pull.c
src/kernel/readpull.c -> applied to
             src/gromacs/gmxpreprocess/readpull.c
src/programs/mdrun/repl_ex.c

Change ignored because was already merged:
       src/gromacs/mdlib/sim_util.c

Deleted. No merge:
src/gmxlib/gpu_utils/dummy.cpp

Removal of INSTALL_NAME_DIR not necessary because
was already not there anymore:
src/gmxlib/CMakeLists.txt
src/tools/CMakeLists.txt
src/kernel/CMakeLists.txt
src/mdlib/CMakeLists.txt

Tools deleted - no merge:
src/tools/gmx_bond.c
src/tools/gmx_kinetics.c

Change-Id: Ibeb5a23cce94fb1765ebee271c9c92e001b83630
44 files changed:
CMakeLists.txt
cmake/gmxManageGPU.cmake
cmake/gmxManageNvccConfig.cmake
share/top/charmm27.ff/ffnonbonded.itp
share/top/oplsaa.ff/watermodels.dat
src/gromacs/fileio/libxdrf.c
src/gromacs/fileio/trx.h
src/gromacs/fileio/trxio.c
src/gromacs/gmxana/anadih.c
src/gromacs/gmxana/gmx_anaeig.c
src/gromacs/gmxana/gmx_analyze.c
src/gromacs/gmxana/gmx_angle.c
src/gromacs/gmxana/gmx_chi.c
src/gromacs/gmxana/gmx_cluster.c
src/gromacs/gmxana/gmx_dos.c
src/gromacs/gmxana/gmx_enemat.c
src/gromacs/gmxana/gmx_energy.c
src/gromacs/gmxana/gmx_genpr.c
src/gromacs/gmxana/gmx_mdmat.c
src/gromacs/gmxana/gmx_mindist.c
src/gromacs/gmxana/gmx_polystat.c
src/gromacs/gmxana/gmx_rama.c
src/gromacs/gmxana/gmx_rms.c
src/gromacs/gmxana/gmx_tcaf.c
src/gromacs/gmxana/gmx_vanhove.c
src/gromacs/gmxana/gmx_wham.cpp
src/gromacs/gmxlib/bondfree.c
src/gromacs/gmxlib/checkpoint.c
src/gromacs/gmxpreprocess/grompp.c
src/gromacs/gmxpreprocess/readpull.c
src/gromacs/gmxpreprocess/toppush.c
src/gromacs/legacyheaders/oenv.h
src/gromacs/legacyheaders/shellfc.h
src/gromacs/legacyheaders/tables.h
src/gromacs/mdlib/pme.c
src/gromacs/mdlib/shellfc.c
src/gromacs/mdlib/tables.c
src/gromacs/mdlib/update.c
src/gromacs/mdlib/wall.c
src/gromacs/pulling/pull.c
src/gromacs/tools/compare.c
src/programs/mdrun/md.c
src/programs/mdrun/mdrun.cpp
src/programs/mdrun/repl_ex.c