diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2015-06-18 08:29:38 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2015-06-18 08:29:38 +0200 |
| commit | 7faffad1907995f1b623ede8fc2e386693428e22 (patch) | |
| tree | 6c68057b690daabf566a1d4825e177af1d8b9355 /pkg/DESCRIPTION | |
| parent | 53099978c971ee8e5c94e67bf972f51629d67fd3 (diff) | |
| parent | fef0bb7fe916f91dcff089c17aa3290c0ea1ab1f (diff) | |
Merge branch 'master' into pfm_chent
Conflicts:
pkg/DESCRIPTION
pkg/NAMESPACE
Diffstat (limited to 'pkg/DESCRIPTION')
| -rw-r--r-- | pkg/DESCRIPTION | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/DESCRIPTION b/pkg/DESCRIPTION index ba69d26..39b8c20 100644 --- a/pkg/DESCRIPTION +++ b/pkg/DESCRIPTION @@ -1,13 +1,13 @@ Package: pfm Type: Package Title: Utilities for pesticide fate modelling -Version: 0.1-3 -Date: 2015-06-09 +Version: 0.2-1 +Date: 2015-06-12 Authors@R: person("Johannes Ranke", email = "jranke@uni-bremen.de", role = c("aut", "cre", "cph")) Description: Utilities for simple PEC calculations and for dealing with data from some FOCUS pesticide fate modelling software. -Depends: R6 +Depends: R6, mkin Suggests: testthat License: GPL LazyLoad: yes |