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

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

author	Roland Schulz <roland@utk.edu>
	Wed, 28 Mar 2012 18:20:34 +0000 (14:20 -0400)
committer	Roland Schulz <roland@utk.edu>
	Wed, 28 Mar 2012 18:40:18 +0000 (14:40 -0400)
commit	d2855fb0941fca1eb132d8e93e4709b533a6ab6e
tree	c8f3c36f0cda21acfbf36aef8c951f7cc86b19f8	tree \| snapshot
parent	a5bc9c563af30f599dab51fcff98d217c167e8c2	commit \| diff
parent	041bdb82cd91f877ed4696d5f6c2b0501c54b3e9	commit \| diff

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

Conflicts:
cmake/gmxCFlags.cmake
src/gromacs/selection/compiler.cpp
src/gromacs/selection/evaluate.cpp
src/gromacs/selection/parsetree.cpp
src/gromacs/selection/position.cpp
src/gromacs/selection/selmethod.cpp

Change-Id: I3fdfeebfea56b0779980949e5c01a869cdab181d

52 files changed:

cmake/gmxCFlags.cmake	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/confio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/enxio.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/gbutil.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/ifunc.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/maths.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/matio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/mvdata.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nrama.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/princ.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/readinp.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/sfactor.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/shift_util.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/trxio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/txtdump.c	diff1 \|	\|	blob \| history
src/gromacs/gmxpreprocess/gen_ad.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/h_db.c	diff1 \|	\|	blob \| history
src/gromacs/gmxpreprocess/pdb2top.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readir.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/resall.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/toputil.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/vsite.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/calcvir.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/constr.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/coupling.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/ebin.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/genborn.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/gmx_parallel_3dfft.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/gmx_wallcycle.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/init.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/mdebin_bar.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/minimize.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/partdec.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/pme.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/pullutil.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/qmmm.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/sim_util.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/tables.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/update.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/vsite.c	diff1 \|	diff2 \|	blob \| history
src/programs/g_x2top/g_x2top.c	diff1 \|	diff2 \|	blob \| history
src/programs/gmxdump/gmxdump.c	diff1 \|	diff2 \|	blob \| history
src/programs/grompp/convparm.c	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/ionize.c	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/repl_ex.c	diff1 \|	diff2 \|	blob \| history
src/programs/pdb2gmx/pdb2gmx.c	diff1 \|	\|	blob \| history
src/programs/pdb2gmx/xlate.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
src/tools/gmx_tune_pme.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_wham.c	diff1 \|	diff2 \|	blob \| history

Local GROMACS mirror with custom stuff

RSS Atom

cmake/gmxCFlags.cmake	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/confio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/enxio.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/gbutil.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/ifunc.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/maths.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/matio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/mvdata.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nrama.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/princ.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/readinp.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/sfactor.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/shift_util.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/trxio.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/txtdump.c	diff1 \|	\|	blob \| history
src/gromacs/gmxpreprocess/gen_ad.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/h_db.c	diff1 \|	\|	blob \| history
src/gromacs/gmxpreprocess/pdb2top.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readir.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/resall.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/toputil.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/vsite.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/calcvir.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/constr.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/coupling.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/ebin.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/genborn.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/gmx_parallel_3dfft.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/gmx_wallcycle.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/init.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/mdebin_bar.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/minimize.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/partdec.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/pme.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/pullutil.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/qmmm.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/sim_util.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/tables.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/update.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/vsite.c	diff1 \|	diff2 \|	blob \| history
src/programs/g_x2top/g_x2top.c	diff1 \|	diff2 \|	blob \| history
src/programs/gmxdump/gmxdump.c	diff1 \|	diff2 \|	blob \| history
src/programs/grompp/convparm.c	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/ionize.c	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/repl_ex.c	diff1 \|	diff2 \|	blob \| history
src/programs/pdb2gmx/pdb2gmx.c	diff1 \|	\|	blob \| history
src/programs/pdb2gmx/xlate.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
src/tools/gmx_tune_pme.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_wham.c	diff1 \|	diff2 \|	blob \| history