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

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

author	Roland Schulz <roland@utk.edu>
	Sun, 29 Apr 2012 01:52:57 +0000 (21:52 -0400)
committer	Roland Schulz <roland@utk.edu>
	Sun, 29 Apr 2012 01:55:58 +0000 (21:55 -0400)
commit	eb0380e91f7aa729cd519bf71ea04f9f82e462b4
tree	fdab1330cd561bf5d727b4cd3d6eeda8c0498688	tree \| snapshot
parent	d61362e669c1427360730578daaa5fac3b706cb5	commit \| diff
parent	20e2eb1b80ac260174f6b19d803060e0e544049b	commit \| diff

Merge release-4-6 into master

Conflicts:
CMakeLists.txt (modified)
cmake/gmxCFlags.cmake
src/gromacs/legacyheaders/CMakeLists.txt (modified)
src/tools/gmx_membed.c
src/tools/gmx_select.c -> change applied to
src/gromacs/trajectoryanalysis/modules/select.cpp

Conflicts (Deleted):
src/gromacs/legacyheaders/pppm.h
src/gromacs/mdlib/ghat.c
src/gromacs/mdlib/pppm.c

Moved:
include/gmx_header_config.h.cmakein -> src/gromacs/legacyheaders/gmx_header_config.h.cmakein

Change-Id: Iec19966d1d7d3dfe817fd3f28197ea620bf55b3e

75 files changed:

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/gmxCFlags.cmake	diff1 \|	diff2 \|	blob \| history
src/config.h.cmakein	diff1 \|	diff2 \|	blob \| history
src/gromacs/genversion.sh	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/atomprop.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/checkpoint.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/copyrite.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/futil.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/gmx_random.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/gmxcpp.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/index.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/main.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/matio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/mshift.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/names.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/oenv.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/rando.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/rmpbc.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/shift_util.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/sighandler.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/tpxio.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/fflibutil.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/gen_ad.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/genhydro.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/pgutil.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readir.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/topio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/CMakeLists.txt	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/checkpoint.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/coulomb.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/futil.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gmx_fatal.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gmx_header_config.h.cmakein	\|	diff2 \|	blob \| history
src/gromacs/legacyheaders/mdrun.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/string2.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/sysstuff.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/thread_mpi/numa_malloc.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/commrec.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/enums.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/update.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/xdrf.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/coupling.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/domdec.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/domdec_setup.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/fft5d.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/force.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/forcerec.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/iteratedconstraints.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/md_support.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/mdatom.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/minimize.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nlistheuristics.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/pme.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/shellfc.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/update.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/trajectoryanalysis/modules/select.cpp	diff1 \|	\|	blob \| history
src/programs/grompp/grompp.c	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/runner.c	diff1 \|	\|	blob \| history
src/programs/mdrun/xutils.c	diff1 \|	\|	blob \| history
src/tools/gmx_editconf.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_membed.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_msd.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_trjconv.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/config.h.cmakein	diff1 \|	diff2 \|	blob \| history
src/gromacs/genversion.sh	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/atomprop.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/checkpoint.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/copyrite.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/futil.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/gmx_random.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/gmxcpp.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/index.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/main.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/matio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/mshift.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/names.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/oenv.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/rando.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/rmpbc.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/shift_util.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/sighandler.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/tpxio.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/fflibutil.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/gen_ad.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/genhydro.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/pgutil.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readir.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/topio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/CMakeLists.txt	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/checkpoint.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/coulomb.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/futil.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gmx_fatal.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gmx_header_config.h.cmakein	\|	diff2 \|	blob \| history
src/gromacs/legacyheaders/mdrun.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/string2.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/sysstuff.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/thread_mpi/numa_malloc.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/commrec.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/enums.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/update.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/xdrf.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/coupling.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/domdec.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/domdec_setup.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/fft5d.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/force.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/forcerec.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/iteratedconstraints.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/md_support.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/mdatom.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/minimize.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nlistheuristics.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/pme.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/shellfc.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/update.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/trajectoryanalysis/modules/select.cpp	diff1 \|	\|	blob \| history
src/programs/grompp/grompp.c	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/runner.c	diff1 \|	\|	blob \| history
src/programs/mdrun/xutils.c	diff1 \|	\|	blob \| history
src/tools/gmx_editconf.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_membed.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_msd.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_trjconv.c	diff1 \|	diff2 \|	blob \| history