Merge remote-tracking branch 'origin/release-4-6' into HEAD
authorRoland Schulz <roland@utk.edu>
Tue, 10 Jul 2012 04:46:15 +0000 (00:46 -0400)
committerRoland Schulz <roland@utk.edu>
Tue, 10 Jul 2012 06:05:20 +0000 (02:05 -0400)
commitbc90f3fd915172b83b732fa443951161dc0baa64
treef2ed757bd2ff7af4799a28a7273a9336ca0fa93b
parent442259a3dde8cf4a9a324064a61830dc085b5839
parent6057a9707e4d1481e07be6ee68067655e38b0c45
Merge remote-tracking branch 'origin/release-4-6' into HEAD

Conflicts:
admin/mknroff.pl (deleted)
share/template/CMakeLists.txt (added both)
src/CMakeLists.txt (trivial)
src/gromacs/gmxlib/oenv.cpp (see next)
src/gromacs/gmxlib/statutil.cpp (change moved to
           src/gromacs/utility/programinfo.cpp)
src/kernel/CMakeLists.txt (added gmx_add_man_page
           to programs/*/CMakeLists.txt)
src/kernel/mk_ghat.c (was deleted. no change)
src/ngmx/CMakeLists.txt (trivial)

Change-Id: Ic8c69541f8d801e3b1d32b26e886cf0602c34cf4
101 files changed:
CMakeLists.txt
cmake/gmxSetBuildInformation.cmake
share/CMakeLists.txt
share/template/CMakeLists.txt
src/CMakeLists.txt
src/config.h.cmakein
src/gromacs/gmxlib/bondfree.c
src/gromacs/gmxlib/checkpoint.c
src/gromacs/gmxlib/gmx_fatal.c
src/gromacs/gmxlib/gmx_omp.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel010_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel020_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel030_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel100_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel101_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel102_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel103_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel104_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel110_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel111_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel112_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel113_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel114_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel120_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel121_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel122_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel123_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel124_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel130_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel131_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel132_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel133_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel134_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel200_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel201_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel202_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel203_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel204_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel210_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel211_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel212_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel213_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel214_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel220_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel221_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel222_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel223_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel224_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel230_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel231_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel232_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel233_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel234_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel300_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel301_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel302_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel303_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel304_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel310_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel311_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel312_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel313_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel314_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel320_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel321_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel322_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel323_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel324_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel330_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel331_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel332_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel333_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel334_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel400_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel410_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel420_c_adress.c
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel430_c_adress.c
src/gromacs/gmxlib/txtdump.c
src/gromacs/gmxlib/wman.cpp
src/gromacs/gmxpreprocess/readir.c
src/gromacs/legacyheaders/gmx_omp.h
src/gromacs/mdlib/fft5d.cpp
src/gromacs/mdlib/forcerec.c
src/gromacs/mdlib/mdebin.c
src/gromacs/mdlib/pme.c
src/gromacs/utility/programinfo.cpp
src/ngmx/CMakeLists.txt
src/programs/g_protonate/CMakeLists.txt
src/programs/g_x2top/CMakeLists.txt
src/programs/g_x2top/g_x2top.c
src/programs/gmxcheck/CMakeLists.txt
src/programs/gmxcheck/gmxcheck.c
src/programs/gmxdump/CMakeLists.txt
src/programs/grompp/CMakeLists.txt
src/programs/grompp/grompp.c
src/programs/mdrun/CMakeLists.txt
src/programs/mdrun/runner.c
src/programs/pdb2gmx/CMakeLists.txt
src/programs/tpbconv/CMakeLists.txt
src/programs/tpbconv/tpbconv.c
src/tools/CMakeLists.txt