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

Merge release-4-6 into master

Conflicts:
share/top/gurgle.dat
src/contrib/addquote.c (deleted)
src/programs/mdrun/pme_loadbal.c

Took for all python files the version with the new copyright:
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/make_nb_kernel_avx_128_fma_double.py
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/make_nb_kernel_avx_128_fma_single.py
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/make_nb_kernel_avx_256_double.py
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/make_nb_kernel_avx_256_single.py
src/gromacs/gmxlib/nonbonded/nb_kernel_c/make_nb_kernel_c.py
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/make_nb_kernel_sse2_double.py
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/make_nb_kernel_sse2_single.py
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/make_nb_kernel_sse4_1_double.py
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/make_nb_kernel_sse4_1_single.py

Change-Id: I8f9181d7d04d9da635ccb2a85f9d5c6255fcdb73

author	Roland Schulz <roland@utk.edu>
	Tue, 26 Feb 2013 19:06:06 +0000 (14:06 -0500)
committer	Roland Schulz <roland@utk.edu>
	Tue, 26 Feb 2013 19:10:05 +0000 (14:10 -0500)
commit	a5ce94ba7a091645380c4591311d19ed3e322acc
tree	7ae4f1b86749d62b1a45ada85d9f95858aa236ef	tree \| snapshot
parent	e0f3377d569bbc17df229fb2c561847ef33a2741	commit \| diff
parent	cdaf7223ebb85962a1ae6b6f09bf76b3f864e1f3	commit \| diff

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/gmxManageMPI.cmake	diff1 \|	diff2 \|	blob \| history
share/top/gurgle.dat	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/copyrite.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_free_energy.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/make_nb_kernel_avx_128_fma_double.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_avx_128_fma_double.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/make_nb_kernel_avx_128_fma_single.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_avx_128_fma_single.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/make_nb_kernel_avx_256_double.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_avx_256_double.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/make_nb_kernel_avx_256_single.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_avx_256_single.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_c/make_nb_kernel_c.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwLJ_GeomP1P1_c.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_c.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/make_nb_kernel_sse2_double.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_sse2_double.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/make_nb_kernel_sse2_single.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_sse2_single.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/make_nb_kernel_sse4_1_double.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_sse4_1_double.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/make_nb_kernel_sse4_1_single.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_sse4_1_single.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nonbonded.c	diff1 \|	\|	blob \| history
src/gromacs/gmxpreprocess/readir.c	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/gmx_simd_macros.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/thread_mpi/atomic/xlc_ppc.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/nbnxn_pairlist.h	diff1 \|	\|	blob \| history
src/gromacs/mdlib/forcerec.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_atomdata.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_outer.h	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_search.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/vsite.c	diff1 \|	\|	blob \| history
src/programs/mdrun/md.c	diff1 \|	\|	blob \| history
src/programs/mdrun/pme_loadbal.c	diff1 \|	\|	blob \| history
src/programs/mdrun/pme_loadbal.h	diff1 \|	\|	blob \| history
src/tools/gmx_dipoles.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_order.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_tune_pme.c	diff1 \|	diff2 \|	blob \| history