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/NAMESPACE | |
| parent | 53099978c971ee8e5c94e67bf972f51629d67fd3 (diff) | |
| parent | fef0bb7fe916f91dcff089c17aa3290c0ea1ab1f (diff) | |
Merge branch 'master' into pfm_chent
Conflicts:
pkg/DESCRIPTION
pkg/NAMESPACE
Diffstat (limited to 'pkg/NAMESPACE')
| -rw-r--r-- | pkg/NAMESPACE | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkg/NAMESPACE b/pkg/NAMESPACE index 7168ebc..4bc5fcf 100644 --- a/pkg/NAMESPACE +++ b/pkg/NAMESPACE @@ -8,5 +8,15 @@ export(geomean) export(pfm_ai) export(pfm_chent) export(pfm_product) +export(PEC_sw_drainage_UK_ini) +export(PEC_sw_drift) +export(PEC_sw_drift_ini) +export(PEC_sw_sed) +export(SFO_actual_twa) +export(SSLRC_mobility_classification) +export(TOXSWA_cwa) +export(geomean) +export(pfm_degradation) export(read.TOXSWA_cwa) +import(mkin) importFrom(R6,R6Class) |