diff --git a/DESCRIPTION b/DESCRIPTION index 1ce835cb..a563b5d4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: poppr Type: Package Title: Genetic Analysis of Populations with Mixed Reproduction -Version: 2.5.0.99-75 +Version: 2.6.0 Date: 2018-01-07 Authors@R: c(person(c("Zhian", "N."), "Kamvar", role = c("cre", "aut"), email = "zkamvar@gmail.com", comment = c(ORCID = "0000-0003-1458-7108")), diff --git a/NEWS b/NEWS index 1b1aa4d4..4363e2b3 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -poppr 2.5.0.99 +poppr 2.6.0 =========== NEW FUNCTIONS diff --git a/cran-comments.md b/cran-comments.md index 138bc249..a9eca5db 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,12 +1,10 @@ -# Poppr version 2.5.0 - -This version incorporates very important bugfixes for my users. +# Poppr version 2.6.0 ## Test environments -* local OS X install, R 3.4.1 -* ubuntu 12.04 (on travis-ci), devel (2017-09-10 r73226) and R 3.4.1 -* winbuilder R-devel (2017-09-08 r73224) +* local OS X install, R 3.4.3 +* ubuntu 12.04 (on travis-ci), devel (2018-01-03 r74038) and R 3.4.3 +* winbuilder R-devel (2018-01-07 r74096) ## R CMD check results