diff options
author | jranke <jranke@edb9625f-4e0d-4859-8d74-9fd3b1da38cb> | 2013-09-13 13:55:49 +0000 |
---|---|---|
committer | jranke <jranke@edb9625f-4e0d-4859-8d74-9fd3b1da38cb> | 2013-09-13 13:55:49 +0000 |
commit | 1766de7cce599ba75c872be08ffb1025e3fb6ea2 (patch) | |
tree | 17c754ec0f8f030743c71a706a25626469e93a36 /DESCRIPTION | |
parent | a68b45bf313ab2eb8f11b6ba17eb0680c5050a2b (diff) |
Just resolved a small conflict caused by a local change before updating
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@91 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
Diffstat (limited to 'DESCRIPTION')
-rw-r--r-- | DESCRIPTION | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/DESCRIPTION b/DESCRIPTION index 626fc30a..52112e94 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -3,7 +3,7 @@ Type: Package Title: Routines for fitting kinetic models with one or more state variables to chemical degradation data Version: 0.9-20 -Date: 2013-06- +Date: 2013-09- Author: Johannes Ranke, Katrin Lindenberger, René Lehmann Maintainer: Johannes Ranke <jranke@uni-bremen.de> Description: Calculation routines based on the FOCUS Kinetics Report (2006). @@ -13,7 +13,7 @@ Description: Calculation routines based on the FOCUS Kinetics Report (2006). (default is a Levenberg-Marquardt variant). Please note that no warranty is implied for correctness of results or fitness for a particular purpose. Depends: FME, deSolve, minpack.lm -Suggests: RUnit +Suggests: RUnit, gWidgetsWWW2, canvas License: GPL LazyLoad: yes LazyData: yes |