[med-svn] [seq-gen] 02/02: Merge branch 'master' of git+ssh://anonscm.debian.org:/git/debian-med/seq-gen

[Steffen Möller]

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

moeller pushed a commit to branch master
in repository seq-gen.

commit 0863e470c63bf12f28267b6f9ae2dec9f3d79ae2
Merge: a44a4d7 937acd3
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Oct 22 00:07:57 2017 +0200

    Merge branch 'master' of git+ssh://anonscm.debian.org:/git/debian-med/seq-gen

 .gitignore                        |   5 +
 debian/changelog                  |  12 ++-
 debian/control                    |   4 +-
 debian/patches/fix_typos.patch    |   2 +-
 debian/source/lintian-overrides   |   3 -
 documentation/Seq-Gen.Manual.html |  55 +++++++++-
 examples/seqs+trees.phy           |   7 ++
 source/aamodels.c                 |   4 +-
 source/aamodels.h                 |   4 +-
 source/eigen.c                    |   4 +-
 source/eigen.h                    |   4 +-
 source/evolve.c                   |   4 +-
 source/evolve.h                   |   4 +-
 source/gamma.c                    |   4 +-
 source/gamma.h                    |   4 +-
 source/global.c                   |   9 +-
 source/global.h                   |   4 +-
 source/model.c                    |   4 +-
 source/model.h                    |   4 +-
 source/nucmodels.c                |   4 +-
 source/nucmodels.h                |   4 +-
 source/progress.c                 |   4 +-
 source/progress.h                 |   4 +-
 source/seq-gen.c                  | 213 +++++++++++++++++++++-----------------
 source/tree.h                     |   4 +-
 source/treefile.c                 |  14 +--
 source/treefile.h                 |   4 +-
 source/twister.c                  |   4 +-
 source/twister.h                  |   4 +-
 29 files changed, 244 insertions(+), 156 deletions(-)

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