[r-cran-afex] 01/02: Merge tag 'upstream/0.15-2'

[Jonathon Love]

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

jonathon-guest pushed a commit to branch master
in repository r-cran-afex.

commit c8531998c9e2f4cef1075a35955468b4f3bbd7ad
Merge: e6d8451 f6b1f53
Author: Jonathon Love <jon at thon.cc>
Date:   Sat Dec 19 14:34:41 2015 +1100

    Merge tag 'upstream/0.15-2'
    
    Upstream version 0.15-2

 DESCRIPTION                                        |   40 +-
 MD5                                                |   77 +-
 NAMESPACE                                          |    1 +
 NEWS                                               |  956 +++++++-------
 R/afex-package.R                                   |    6 +-
 R/allFit.R                                         |  176 +--
 R/aov_car.R                                        |  778 ++++++------
 R/compare.2.vectors.R                              |  186 +--
 R/deprecated.R                                     |   58 +-
 R/ems.R                                            |  214 ++--
 R/helpers.R                                        |   96 +-
 R/ks2013.3-data.R                                  |   56 +-
 R/md_12.1-data.R                                   |   90 +-
 R/md_15.1-data.R                                   |  122 +-
 R/md_16.1-data.R                                   |   68 +-
 R/md_16.4-data.R                                   |   68 +-
 R/methods.afex_aov.R                               |  286 +++--
 R/mixed.R                                          | 1328 ++++++++++----------
 R/nice.R                                           |  286 ++---
 R/obk.long-data.R                                  |   92 +-
 R/round_ps.R                                       |   56 +-
 R/set_contrasts.R                                  |   90 +-
 R/sk2011.1-data.R                                  |   90 +-
 R/sk2011.2-data.R                                  |   64 +-
 inst/doc/anova_posthoc.R                           |    2 +-
 inst/doc/anova_posthoc.Rmd                         |    2 +-
 inst/doc/anova_posthoc.html                        |  154 +--
 man/afex-package.Rd                                |    6 +-
 man/afex_aov-methods.Rd                            |   11 +-
 man/mixed.Rd                                       |    6 +-
 man/nice.Rd                                        |   11 +-
 tests/testthat.R                                   |    8 +-
 tests/testthat/test-afex_aov.R                     |  106 +-
 ..._car-basic.car-basic.R => test-aov_car-basic.R} |  210 ++--
 ...ov_car-basic.car-bugs.R => test-aov_car-bugs.R} |  377 +++---
 ....car-structural.R => test-aov_car-structural.R} |   84 +-
 tests/testthat/test-mixed-bugs.R                   |   11 +
 tests/testthat/test-mixed-mw.R                     |   92 +-
 tests/testthat/test-mixed-structure.R              |  324 ++---
 vignettes/anova_posthoc.Rmd                        |    2 +-
 40 files changed, 3400 insertions(+), 3290 deletions(-)

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