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

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

author	Teemu Murtola <teemu.murtola@cbr.su.se>
	Sun, 26 Dec 2010 16:58:28 +0000 (18:58 +0200)
committer	Teemu Murtola <teemu.murtola@cbr.su.se>
	Sun, 26 Dec 2010 16:58:28 +0000 (18:58 +0200)
commit	4a8dfca6e6f3bdb5eed392f6c80682c1b8fba0bf
tree	043d795ec404b9ec184b7e2bb04ff2e5ef95543c	tree \| snapshot
parent	5b93a55ca79e585be180880e0834051eec6b36f9	commit \| diff
parent	4a86a9d814afcb6397ee18ec62040184ad9cb9c4	commit \| diff

Merge branch 'cpp-analysis'

Header installation does not yet work.

Conflicts:
src/gromacs/CMakeLists.txt
src/gromacs/options/tests/CMakeLists.txt
src/gromacs/selection/CMakeLists.txt
src/gromacs/selection/params.cpp
src/gromacs/selection/regenerate_parser.sh
src/gromacs/selection/selcollection.h
src/gromacs/selection/selection.cpp
src/gromacs/selection/selhelp.cpp
src/gromacs/selection/sm_keywords.cpp
src/gromacs/trajana/trajana.cpp
src/gromacs/trajana/trajana.h
src/tools/CMakeLists.txt

53 files changed:

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/config.h.cmakein	diff1 \|	diff2 \|	blob \| history
src/gromacs/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/analysisdata/CMakeLists.txt	\|	\|	blob
src/gromacs/legacyheaders/gmxfio.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/options/tests/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/centerofmass.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/centerofmass.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/compiler.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/evaluate.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/evaluate.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/indexutil.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/indexutil.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/mempool.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/nbsearch.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/nbsearch.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/params.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/parsetree.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/parsetree.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/poscalc.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/poscalc.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/position.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/position.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/scanner_internal.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/selection.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/selelem.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/selelem.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/selhelp.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/selmethod.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/selmethod.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/selparam.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/selvalue.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/selvalue.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/sm_compare.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/sm_distance.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/sm_insolidangle.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/sm_keywords.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/sm_merge.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/sm_permute.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/sm_position.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/sm_same.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/sm_simple.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/symrec.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/tests/CMakeLists.txt	\|	diff2 \|	blob \| history
src/gromacs/trajectoryanalysis/CMakeLists.txt	\|	diff2 \|	blob \| history
src/gromacs/trajectoryanalysis/analysismodule-impl.h	\|	diff2 \|	blob \| history
src/gromacs/trajectoryanalysis/runnercommon.cpp	\|	diff2 \|	blob \| history
src/gromacs/trajectoryanalysis/tests/CMakeLists.txt	\|	diff2 \|	blob \| history
src/programs/CMakeLists.txt	\|	diff2 \|	blob \| history
src/programs/g_ana/CMakeLists.txt	\|	diff2 \|	blob \| history
src/tools/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history

Local GROMACS mirror with custom stuff

RSS Atom

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/config.h.cmakein	diff1 \|	diff2 \|	blob \| history
src/gromacs/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/analysisdata/CMakeLists.txt	\|	\|	blob
src/gromacs/legacyheaders/gmxfio.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/options/tests/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/centerofmass.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/centerofmass.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/compiler.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/evaluate.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/evaluate.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/indexutil.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/indexutil.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/mempool.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/nbsearch.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/nbsearch.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/params.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/parsetree.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/parsetree.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/poscalc.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/poscalc.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/position.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/position.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/scanner_internal.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/selection.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/selelem.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/selelem.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/selhelp.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/selmethod.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/selmethod.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/selparam.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/selvalue.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/selvalue.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/sm_compare.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/sm_distance.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/sm_insolidangle.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/sm_keywords.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/sm_merge.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/sm_permute.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/sm_position.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/sm_same.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/sm_simple.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/symrec.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/selection/tests/CMakeLists.txt	\|	diff2 \|	blob \| history
src/gromacs/trajectoryanalysis/CMakeLists.txt	\|	diff2 \|	blob \| history
src/gromacs/trajectoryanalysis/analysismodule-impl.h	\|	diff2 \|	blob \| history
src/gromacs/trajectoryanalysis/runnercommon.cpp	\|	diff2 \|	blob \| history
src/gromacs/trajectoryanalysis/tests/CMakeLists.txt	\|	diff2 \|	blob \| history
src/programs/CMakeLists.txt	\|	diff2 \|	blob \| history
src/programs/g_ana/CMakeLists.txt	\|	diff2 \|	blob \| history
src/tools/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history