[med-svn] [probabel] 02/03: Merge tag 'upstream/0.4.5'

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository probabel.

commit a3a1767e2ad7ab6b73787685e9f4c9856a2e672c
Merge: bf79dd1 a17cb63
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jul 10 06:49:43 2015 +0200

    Merge tag 'upstream/0.4.5'
    
    Upstream version 0.4.5
    
    Conflicts:
    	Makefile.in
    	aclocal.m4
    	checks/Makefile.in
    	checks/R-tests/Makefile.in
    	configure
    	configure.ac
    	doc/ChangeLog
    	doc/Makefile.in
    	doc/ProbABEL_manual.tex
    	doc/pacoxph.1
    	doc/palinear.1
    	doc/palogist.1
    	doc/probabel.1
    	doc/probabel.pl.1
    	examples/Makefile.in
    	src/Makefile.in
    	src/coxph_data.cpp

 Makefile.in                              |  745 ++++++++++
 aclocal.m4                               |    3 +-
 checks/Makefile.am                       |   18 +-
 checks/Makefile.in                       |  955 +++++++++++++
 checks/R-tests/Makefile.am               |   15 +-
 checks/R-tests/Makefile.in               |  881 ++++++++++++
 checks/R-tests/run_model_coxph.R         |   65 +-
 checks/R-tests/run_models_in_R_pacox.R   |   85 +-
 checks/inputfiles/coxph_data_nocovar.txt |  201 +++
 checks/test_cox_nocovar.sh               |   82 ++
 compile                                  |  143 ++
 configure                                |   21 +-
 configure.ac                             |    2 +-
 depcomp                                  |  630 +++++++++
 doc/ChangeLog                            |   20 +
 doc/Makefile.in                          |  568 ++++++++
 doc/ProbABEL_manual.tex                  |   58 +-
 doc/pacoxph.1                            |    5 +-
 doc/palinear.1                           |    2 +-
 doc/palogist.1                           |    4 +-
 doc/probabel.1                           |    2 +-
 doc/probabel.pl.1                        |    2 +-
 examples/Makefile.in                     |  629 +++++++++
 install-sh                               |  520 +++++++
 src/Makefile.in                          | 2174 ++++++++++++++++++++++++++++++
 src/command_line_settings.cpp            |    2 +-
 src/coxph_data.cpp                       |   66 +-
 src/fvlib/CastUtils.h                    |    3 +
 src/phedata.cpp                          |    9 +-
 29 files changed, 7813 insertions(+), 97 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/probabel.git