[frog] 02/03: Merge tag 'upstream/0.12.20'

[Joost van Baal]

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

joostvb pushed a commit to branch master
in repository frog.

commit c97358691c58479ac6de6970950c6ded3c2a8d10
Merge: 7d295b7 5b22fc8
Author: Joost van Baal-Ilić <joostvb at nusku.mdcc.cx>
Date:   Sun Jul 5 05:26:40 2015 +0200

    Merge tag 'upstream/0.12.20'
    
    Upstream version 0.12.20

 AUTHORS                           |  5 +--
 ChangeLog                         | 31 ++++++++++++++
 NEWS                              |  8 +++-
 configure                         | 20 ++++-----
 configure.ac                      |  2 +-
 docs/frog.1                       | 89 +++++++++++++++++++++++----------------
 include/frog/Frog.h               |  4 +-
 include/frog/FrogAPI.h            |  4 +-
 include/frog/Parser.h             |  4 +-
 include/frog/cgn_tagger_mod.h     |  4 +-
 include/frog/iob_tagger_mod.h     |  4 +-
 include/frog/mblem_mod.h          |  4 +-
 include/frog/mbma_mod.h           |  4 +-
 include/frog/mwu_chunker_mod.h    |  4 +-
 include/frog/ner_tagger_mod.h     |  4 +-
 include/frog/ucto_tokenizer_mod.h |  4 +-
 src/Frog-util.cxx                 |  4 +-
 src/Frog.cxx                      |  8 ++--
 src/FrogAPI.cxx                   | 20 ++++-----
 src/Parser.cxx                    |  4 +-
 src/cgn_tagger_mod.cxx            |  4 +-
 src/iob_tagger_mod.cxx            |  4 +-
 src/mblem_mod.cxx                 |  4 +-
 src/mblem_prog.cxx                |  6 +--
 src/mbma_mod.cxx                  |  4 +-
 src/mbma_prog.cxx                 |  6 +--
 src/mwu_chunker_mod.cxx           |  4 +-
 src/ner_tagger_mod.cxx            |  4 +-
 src/ucto_tokenizer_mod.cxx        |  4 +-
 29 files changed, 161 insertions(+), 110 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/frog.git