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

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

author	Roland Schulz <roland@utk.edu>
	Wed, 6 Jun 2012 12:13:00 +0000 (08:13 -0400)
committer	Roland Schulz <roland@utk.edu>
	Wed, 6 Jun 2012 12:14:15 +0000 (08:14 -0400)
commit	c48fb9444c34e6d8e0ad61c7008d1217e843f143
tree	af6b34bc63e544f7fd0bf4f0184d2825f3c38cdd	tree \| snapshot
parent	1c6a7753a28feb5c3d2b03df648ac3e65741564e	commit \| diff
parent	c7a82654f2eb8992067079c3196f59d69e3f95f6	commit \| diff

Merge branch 'release-4-6'

Conflicts:
src/gromacs/gmxlib/dihres.c
src/gromacs/legacyheaders/dihre.h
src/gromacs/mdlib/force.c
src/gromacs/mdlib/mdebin.c
src/gromacs/mdlib/sim_util.c
src/programs/mdrun/md.c

Change-Id: I0c5e6d8e57f9f19da73a81737c3105dcd55488ec
Moved:
src/mdlib/expanded.c ->
src/gromacs/mdlib/expanded.c

77 files changed:

src/gromacs/gmxlib/bondfree.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/checkpoint.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/enxio.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/ifunc.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/inputrec.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/mvdata.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/names.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_free_energy.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_free_energy.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nonbonded.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nrnb.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/topsort.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/tpxio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/trxio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/txtdump.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/typedefs.c	diff1 \|	\|	blob \| history
src/gromacs/gmxpreprocess/compute_io.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readir.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readir.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readpull.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/bondf.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/checkpoint.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/constr.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/force.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/mdebin.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/mdrun.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/names.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/nonbonded.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/ns.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/pull.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/tpxio.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/trnio.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/typedefs.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/enums.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/fcdata.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/forcerec.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/idef.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/inputrec.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/state.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/trx.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/update.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/constr.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/coupling.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/domdec.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/domdec_top.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/expanded.c	\|	\|	blob
src/gromacs/mdlib/force.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/forcerec.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/init.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/md_support.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/mdebin.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/mdebin_bar.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/mdebin_bar.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/minimize.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/ns.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/partdec.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/pull.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/tgroup.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/tpi.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/update.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/wall.c	diff1 \|	diff2 \|	blob \| history
src/programs/gmxcheck/gmxcheck.c	diff1 \|	diff2 \|	blob \| history
src/programs/gmxcheck/tpbcmp.c	diff1 \|	diff2 \|	blob \| history
src/programs/grompp/convparm.c	diff1 \|	diff2 \|	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/md_openmm.h	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/mdrun.c	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/repl_ex.c	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/repl_ex.h	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/runner.c	diff1 \|	\|	blob \| history
src/programs/tpbconv/tpbconv.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_bar.c	diff1 \|	diff2 \|	blob \| history

Local GROMACS mirror with custom stuff

RSS Atom

src/gromacs/gmxlib/bondfree.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/checkpoint.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/enxio.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/ifunc.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/inputrec.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/mvdata.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/names.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_free_energy.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_free_energy.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nonbonded.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nrnb.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/topsort.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/tpxio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/trxio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/txtdump.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/typedefs.c	diff1 \|	\|	blob \| history
src/gromacs/gmxpreprocess/compute_io.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readir.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readir.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readpull.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/bondf.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/checkpoint.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/constr.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/force.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/mdebin.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/mdrun.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/names.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/nonbonded.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/ns.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/pull.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/tpxio.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/trnio.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/typedefs.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/enums.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/fcdata.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/forcerec.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/idef.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/inputrec.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/state.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/types/trx.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/update.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/constr.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/coupling.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/domdec.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/domdec_top.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/expanded.c	\|	\|	blob
src/gromacs/mdlib/force.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/forcerec.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/init.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/md_support.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/mdebin.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/mdebin_bar.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/mdebin_bar.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/minimize.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/ns.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/partdec.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/pull.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/tgroup.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/tpi.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/update.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/wall.c	diff1 \|	diff2 \|	blob \| history
src/programs/gmxcheck/gmxcheck.c	diff1 \|	diff2 \|	blob \| history
src/programs/gmxcheck/tpbcmp.c	diff1 \|	diff2 \|	blob \| history
src/programs/grompp/convparm.c	diff1 \|	diff2 \|	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/md_openmm.h	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/mdrun.c	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/repl_ex.c	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/repl_ex.h	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/runner.c	diff1 \|	\|	blob \| history
src/programs/tpbconv/tpbconv.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_bar.c	diff1 \|	diff2 \|	blob \| history