diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2015-08-26 14:17:48 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2015-08-26 14:17:48 +0200 |
| commit | 6156796699845eca57ae1b8515016deb14d445e6 (patch) | |
| tree | 3136473a8c87397984e73061b34bbc8ca6a29935 /pkg | |
| parent | 83c8575e2abde12208584b9c80935d4a873689fd (diff) | |
| parent | 1ec3ee4a03d4e47fdd3be1bcbe754e478353410b (diff) | |
Merge branch 'master' into pfm_chent
Conflicts:
pkg/DESCRIPTION
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/DESCRIPTION | 2 | ||||
| -rw-r--r-- | pkg/NAMESPACE | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/pkg/DESCRIPTION b/pkg/DESCRIPTION index 1371f5d..247df20 100644 --- a/pkg/DESCRIPTION +++ b/pkg/DESCRIPTION @@ -2,7 +2,7 @@ Package: pfm Type: Package Title: Utilities for Pesticide Fate Modelling Version: 0.2-3.900 -Date: 2015-08-21 +Date: 2015-08-26 Authors@R: person("Johannes Ranke", email = "jranke@uni-bremen.de", role = c("aut", "cre", "cph")) Description: Utilities for simple calculations of predicted environmental diff --git a/pkg/NAMESPACE b/pkg/NAMESPACE index 7e99d47..2b7f1d6 100644 --- a/pkg/NAMESPACE +++ b/pkg/NAMESPACE @@ -1,7 +1,6 @@ # Generated by roxygen2 (4.1.1): do not edit by hand S3method(plot,TOXSWA_cwa) -export(PEC_pw) export(PEC_soil) export(PEC_soil_product) export(PEC_sw_drainage_UK_ini) |