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

biod.pnpi.spb.ru / alexxy / gromacs.git / commit

author	Roland Schulz <roland@utk.edu>
	Sun, 18 Mar 2012 08:27:20 +0000 (04:27 -0400)
committer	Roland Schulz <roland@utk.edu>
	Sun, 18 Mar 2012 08:49:48 +0000 (04:49 -0400)
commit	27b998a020ba77454e02bc5f95683736a62b7db9
tree	8ce7196abb18ea58a638ba92d862ee15be59a846	tree \| snapshot
parent	66853790140681acde51f80e8e953f21f327635d	commit \| diff
parent	6237c92943166da7c7352d8bbbeafd2307308167	commit \| diff

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

Conflicts:
cmake/gmxCFlags.cmake
src/gmxlib/trajana/trajana.c
src/gromacs/gmxlib/futil_test.c
src/gromacs/mdlib/gmx_qhop_db.h
src/gromacs/mdlib/gmx_qhop_db_test.c
src/gromacs/mdlib/gmx_qhop_parm.c
src/gromacs/mdlib/gmx_qhop_parm.h
src/gromacs/mdlib/gmx_qhop_xml.c
src/gromacs/mdlib/gmx_qhop_xml.h
src/mdlib/CMakeLists.txt
src/tools/gmx_membed.c

Modified:
src/gromacs/mdlib/CMakeLists.txt

Change-Id: I488bad71819d07ccf14172e83b5226a312fa696c

61 files changed:

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/gmxCFlags.cmake	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/checkpoint.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/confio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/copyrite.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/enxio.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/gmxfio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/maths.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/md5.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/network.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_bluegene/nb_kernel_gen_bluegene.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel430_sse2_double.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/pdbio.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/splitter.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/statutil.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/string2.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/thread_mpi/p2p_send_recv.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/trnio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/vmdio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/wman.c	diff1 \|	\|	blob \| history
src/gromacs/gmxpreprocess/pdb2top.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/pgutil.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readpull.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readrot.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/assert.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/simple.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/CMakeLists.txt	diff1 \|	\|	blob \| history
src/gromacs/mdlib/domdec.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/domdec_setup.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/ebin.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/edsam.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/fft5d.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/forcerec.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/minimize.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/pull.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/sim_util.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/stat.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/tables.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/wnblist.c	diff1 \|	diff2 \|	blob \| history
src/programs/g_x2top/g_x2top.c	diff1 \|	diff2 \|	blob \| history
src/programs/gmxcheck/gmxcheck.c	diff1 \|	diff2 \|	blob \| history
src/programs/gmxdump/gmxdump.c	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/gmx_gpu_utils/memtestG80_core.cu	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/gmx_gpu_utils/memtestG80_core.h	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/md.c	diff1 \|	\|	blob \| history
src/programs/mdrun/md_openmm.c	diff1 \|	\|	blob \| history
src/programs/mdrun/mdrun.c	diff1 \|	\|	blob \| history
src/programs/mdrun/openmm_wrapper.cpp	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/runner.c	diff1 \|	\|	blob \| history
src/programs/mdrun/xmdrun.h	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/xutils.c	diff1 \|	\|	blob \| history
src/tools/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_anaeig.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_bond.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_chi.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_current.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_density.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_editconf.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_membed.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_spatial.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_tune_pme.c	diff1 \|	diff2 \|	blob \| history

Local GROMACS mirror with custom stuff

RSS Atom

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/gmxCFlags.cmake	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/checkpoint.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/confio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/copyrite.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/enxio.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/gmxfio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/maths.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/md5.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/network.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_bluegene/nb_kernel_gen_bluegene.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel430_sse2_double.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/pdbio.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/splitter.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/statutil.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/string2.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/thread_mpi/p2p_send_recv.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/trnio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/vmdio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/wman.c	diff1 \|	\|	blob \| history
src/gromacs/gmxpreprocess/pdb2top.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/pgutil.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readpull.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readrot.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/assert.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/simple.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/CMakeLists.txt	diff1 \|	\|	blob \| history
src/gromacs/mdlib/domdec.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/domdec_setup.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/ebin.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/edsam.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/fft5d.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/forcerec.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/minimize.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/pull.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/sim_util.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/stat.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/tables.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/wnblist.c	diff1 \|	diff2 \|	blob \| history
src/programs/g_x2top/g_x2top.c	diff1 \|	diff2 \|	blob \| history
src/programs/gmxcheck/gmxcheck.c	diff1 \|	diff2 \|	blob \| history
src/programs/gmxdump/gmxdump.c	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/gmx_gpu_utils/memtestG80_core.cu	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/gmx_gpu_utils/memtestG80_core.h	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/md.c	diff1 \|	\|	blob \| history
src/programs/mdrun/md_openmm.c	diff1 \|	\|	blob \| history
src/programs/mdrun/mdrun.c	diff1 \|	\|	blob \| history
src/programs/mdrun/openmm_wrapper.cpp	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/runner.c	diff1 \|	\|	blob \| history
src/programs/mdrun/xmdrun.h	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/xutils.c	diff1 \|	\|	blob \| history
src/tools/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_anaeig.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_bond.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_chi.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_current.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_density.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_editconf.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_membed.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_spatial.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_tune_pme.c	diff1 \|	diff2 \|	blob \| history