This is an automated email from the git hooks/post-receive script. lckarssen-guest pushed a commit to branch master in repository probabel.
commit 6a5e79a0945920d8e44d72e800b194885d2941f3 Merge: 646f05f e9ad568 Author: L.C. Karssen <[email protected]> Date: Wed Apr 2 09:53:31 2014 +0200 Fixed conflicts from upload of upstream version 0.4.3. checks/R-tests/Makefile.am | 5 + checks/R-tests/Makefile.in | 3 +- checks/R-tests/run_models_in_R_pacox.R | 5 +- checks/run_diff.sh | 2 +- configure | 20 +-- configure.ac | 4 +- doc/ChangeLog | 12 +- doc/INSTALL | 3 + doc/ProbABEL_manual.tex | 225 +++++++++++++++++++++++++++++---- doc/pacoxph.1 | 2 +- doc/palinear.1 | 2 +- doc/palogist.1 | 2 +- doc/probabel.1 | 2 +- doc/probabel.pl.1 | 2 +- src/command_line_settings.cpp | 21 +++ src/command_line_settings.h | 21 +++ src/coxph_data.cpp | 22 ++++ src/coxph_data.h | 21 +++ src/data.cpp | 23 ++++ src/data.h | 21 +++ src/eigen_mematrix.cpp | 32 ++++- src/eigen_mematrix.h | 23 ++++ src/gendata.cpp | 39 +++++- src/gendata.h | 21 +++ src/main.cpp | 24 ++++ src/main_functions_dump.cpp | 20 +++ src/main_functions_dump.h | 21 +++ src/maskedmatrix.cpp | 21 +++ src/maskedmatrix.h | 21 +++ src/mematri1.h | 23 ++++ src/mematrix.h | 23 ++++ src/phedata.cpp | 23 ++++ src/phedata.h | 21 +++ src/reg1.cpp | 34 ++++- src/reg1.h | 24 ++++ src/regdata.cpp | 22 ++++ src/regdata.h | 21 +++ src/usage.cpp | 27 +++- src/usage.h | 21 +++ src/utilities.cpp | 22 ++++ src/utilities.h | 21 +++ 41 files changed, 857 insertions(+), 65 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/probabel.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
