BioD PNPI Git Repos - alexxy/gromacs.git/commit

Merge remote-tracking branch 'gerrit/release-4-6'

Moved files added to include/ to src/gromacs/legacyheaders/ and
files added to src/gmxlib/ to src/gromacs/gmxlib/.

Conflicts:
    CMakeLists.txt
    src/config.h.cmakein

Conflicts for files removed from master:
    cmake/gmxTestInlineASM.cmake (resurrected)
    cmake/TestInlineASM_gcc_x86.c (no conflict, resurrected)
    src/gmxlib/CMakeLists.txt
        (changes applied to src/gromacs/CMakeLists.txt and
        src/gromacs/gmxlib/CMakeLists.txt)

Conflicts for files removed from release-4-6:
    src/gromacs/gmxlib/nonbonded/nb_kernel_ia32_sse/*
    src/gromacs/gmxlib/nonbonded/nb_kernel_ia32_sse2/*
    src/gromacs/gmxlib/nonbonded/nb_kernel_ia64_double/*
    src/gromacs/gmxlib/nonbonded/nb_kernel_ia64_single/*
    src/gromacs/gmxlib/nonbonded/nb_kernel_ppc_altivec/*
    src/gromacs/gmxlib/nonbonded/nb_kernel_x86_64_sse/*
    src/gromacs/gmxlib/nonbonded/nb_kernel_x86_64_sse2/*
    src/gromacs/legacyheaders/gmx_sse2_double.h
    src/gromacs/legacyheaders/gmx_sse2_single.h

Change-Id: I6202a89a802a8fd3e1788df95eac408cf60f3456

author	Teemu Murtola <teemu.murtola@gmail.com>
	Sun, 24 Jun 2012 17:00:12 +0000 (13:00 -0400)
committer	Roland Schulz <roland@utk.edu>
	Sun, 24 Jun 2012 17:05:23 +0000 (13:05 -0400)
commit	79e6e1a447486bd1a1c0b133843ed829827aeef4
tree	5b1c4b63f2af7e94c38d2fce8ae5b3f726520e59	tree \| snapshot
parent	2f17ff6268bc869e37965f8443db4f4ea10cd7ab	commit \| diff
parent	b45713791f43cddf2743755cad1f3cff0ad0518a	commit \| diff

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/gmxDetectAcceleration.cmake	\|	diff2 \|	blob \| history
cmake/gmxSetBuildInformation.cmake	\|	diff2 \|	blob \| history
src/config.h.cmakein	diff1 \|	diff2 \|	blob \| history
src/gromacs/CMakeLists.txt	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/CMakeLists.txt	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/checkpoint.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/gmx_detectcpu.c	\|	diff2 \|	blob \| history
src/gromacs/gmxlib/main.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/CMakeLists.txt	\|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel400_sse2_double.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel410_sse2_double.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel430_sse2_double.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel110_sse2_single.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel332_sse2_single.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel332_sse2_single.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel400_sse2_single.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel410_sse2_single.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel430_sse2_single.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_allvsall_sse2_single.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_allvsallgb_sse2_single.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/sse_common_single.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nonbonded.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gmx_cyclecounter.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gmx_detectcpu.h	\|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gmx_math_x86_avx_128_fma_double.h	\|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gmx_math_x86_avx_128_fma_single.h	\|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gmx_math_x86_avx_256_double.h	\|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gmx_math_x86_avx_256_single.h	\|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gmx_math_x86_sse2_double.h	\|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gmx_math_x86_sse2_single.h	\|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gmx_math_x86_sse4_1_double.h	\|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gmx_math_x86_sse4_1_single.h	\|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gmx_x86_avx_128_fma.h	\|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gmx_x86_avx_256.h	\|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gmx_x86_sse2.h	\|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gmx_x86_sse4_1.h	\|	diff2 \|	blob \| history
src/gromacs/legacyheaders/nonbonded.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/thread_mpi/atomic/cycles.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/forcerec.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/forcerec.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/genborn.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/genborn_allvsall_sse2_double.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/genborn_allvsall_sse2_single.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/genborn_sse2_double.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/genborn_sse2_single.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/pme.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/tpi.c	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/md.c	diff1 \|	\|	blob \| history
src/programs/mdrun/openmm_wrapper.cpp	diff1 \|	\|	blob \| history
src/tools/gmx_dyecoupl.c	diff1 \|	diff2 \|	blob \| history