[r-cran-nlp] 02/13: Merge tag 'upstream/0.1-11'

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository r-cran-nlp.

commit f0f4be6163b7190bea0cf12b59d9ae5b8399eaf1
Merge: e3b47d4 cdcaaa4
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Mon Oct 2 15:52:52 2017 +0200

    Merge tag 'upstream/0.1-11'
    
    Upstream version 0.1-11

 DESCRIPTION                          |   8 +--
 MD5                                  |  34 +++++-----
 NAMESPACE                            |  12 ++++
 R/annotation.R                       |   4 +-
 R/annotators.R                       |  14 ++--
 R/aptd.R                             |   4 +-
 R/conll.R                            | 100 +++++++++++++++++++++-------
 R/conllu.R                           | 125 +++++++++++++++++++++++++++++++++++
 R/datetime.R                         |   6 +-
 R/language.R                         |   4 +-
 R/sysdata.rda                        | Bin 92004 -> 92256 bytes
 R/ttd.R                              |   2 +-
 inst/po/en at quot/LC_MESSAGES/R-NLP.mo | Bin 0 -> 2799 bytes
 man/AnnotatedPlainTextDocument.Rd    |   2 +-
 man/Annotator.Rd                     |   2 +-
 man/CoNLLTextDocument.Rd             |  40 ++++++++---
 man/CoNLLUTextDocument.Rd            |  84 +++++++++++++++++++++++
 man/TaggedTextDocument.Rd            |   2 +-
 man/tagsets.Rd                       |  13 +++-
 po/R-NLP.pot                         |  83 +++++++++++++++++++++++
 20 files changed, 461 insertions(+), 78 deletions(-)

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