diff options
author | Johannes Ranke <jranke@uni-bremen.de> | 2020-04-03 17:40:55 +0200 |
---|---|---|
committer | Johannes Ranke <jranke@uni-bremen.de> | 2020-04-03 17:40:55 +0200 |
commit | 8c19fc5261dc53dc7880b3f54f8f2adf413de996 (patch) | |
tree | 193aad4a3b2920ad6bff1d54cd18e992ac179bdd /DESCRIPTION | |
parent | 312255078d2529f485a81df2a53d5928622ae81f (diff) | |
parent | 47ba9ea512b82fb8b31da8ec5558f3c0952d86d4 (diff) |
Merge branch 'master' into mxkin
Merge DESCRIPTION manually to combine dependencies and rerun check to
update check.log
Diffstat (limited to 'DESCRIPTION')
-rw-r--r-- | DESCRIPTION | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/DESCRIPTION b/DESCRIPTION index d1007cc5..1aa5cac2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,7 +2,7 @@ Package: mkin Type: Package Title: Kinetic Evaluation of Chemical Degradation Data Version: 0.9.49.9 -Date: 2020-01-09 +Date: 2020-03-31 Authors@R: c(person("Johannes", "Ranke", role = c("aut", "cre", "cph"), email = "jranke@uni-bremen.de", comment = c(ORCID = "0000-0003-4371-6538")), @@ -17,7 +17,7 @@ Description: Calculation routines based on the FOCUS Kinetics Report (2006, note that no warranty is implied for correctness of results or fitness for a particular purpose. Imports: stats, graphics, methods, deSolve, R6, inline, parallel, numDeriv, - lmtest, nlme, purrr + lmtest, pkgbuild, nlme, purrr Suggests: knitr, rbenchmark, tikzDevice, testthat, rmarkdown, covr, vdiffr, benchmarkme, tibble, stats4 License: GPL |