[med-svn] [r-cran-scales] 02/07: Merge tag 'upstream/0.4.1'

[Andreas Tille]

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

tille pushed a commit to branch master
in repository r-cran-scales.

commit 6800df226ce4add17d43fbb6bc48d794324234d1
Merge: a706532 63880bf
Author: Andreas Tille <tille at debian.org>
Date:   Mon Nov 14 09:46:58 2016 +0100

    Merge tag 'upstream/0.4.1'
    
    Upstream version 0.4.1
    
    Conflicts:
    	LICENSE

 DESCRIPTION                           |   8 +++---
 LICENSE                               |   2 ++
 MD5                                   |  29 +++++++++++---------
 NAMESPACE                             |   1 +
 NEWS.md                               |   9 +++++++
 R/RcppExports.R                       |   2 +-
 R/breaks.r                            |   8 +++++-
 R/scale-discrete.r                    |  21 +++++++++------
 R/trans-date.r                        |  49 +++++++++++++++++++++++++++++++++-
 README.md                             |   2 +-
 build/partial.rdb                     | Bin 8415 -> 7869 bytes
 man/hms_trans.Rd                      |  21 +++++++++++++++
 man/time_trans.Rd                     |   4 +--
 man/train_discrete.Rd                 |   4 ++-
 src/RcppExports.cpp                   |  26 +++++++++---------
 tests/testthat/test-breaks-extended.R |   9 +++++++
 tests/testthat/test-discrete.R        |  22 +++++++++++++++
 17 files changed, 172 insertions(+), 45 deletions(-)

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