[Picante-commits] r100 - in branches/gsoc: . man

[noreply at r-forge.r-project.org]

Author: skembel
Date: 2008-06-11 23:20:24 +0200 (Wed, 11 Jun 2008)
New Revision: 100

Modified:
   branches/gsoc/DESCRIPTION
   branches/gsoc/man/picante-package.Rd
Log:
Merging trunk latest to gsoc branch

Modified: branches/gsoc/DESCRIPTION
===================================================================
--- branches/gsoc/DESCRIPTION	2008-06-11 21:02:44 UTC (rev 99)
+++ branches/gsoc/DESCRIPTION	2008-06-11 21:20:24 UTC (rev 100)
@@ -1,9 +1,9 @@
 Package: picante
 Type: Package
 Title: Tools for integrating phylogenies and ecology
-Version: 0.1-2
-Date: 2008-5-30
-Author: Steve Kembel <skembel at berkeley.edu>, David Ackerly <dackerly at berkeley.edu>, Simon Blomberg <s.blomberg1 at uq.edu.au>, Peter Cowan <pdc at berkeley.edu>, Cam Webb <cwebb at oeb.harvard.edu>
+Version: 0.2-0
+Date: 2008-6-10
+Author: Steve Kembel <skembel at berkeley.edu>, David Ackerly <dackerly at berkeley.edu>, Simon Blomberg <s.blomberg1 at uq.edu.au>, Peter Cowan <pdc at berkeley.edu>, Matthew Helmus <mrhelmus at wisc.edu>, Cam Webb <cwebb at oeb.harvard.edu>
 Maintainer: Steve Kembel <skembel at berkeley.edu>
 Depends: ape, vegan
 Suggests: circular

Modified: branches/gsoc/man/picante-package.Rd
===================================================================
--- branches/gsoc/man/picante-package.Rd	2008-06-11 21:02:44 UTC (rev 99)
+++ branches/gsoc/man/picante-package.Rd	2008-06-11 21:20:24 UTC (rev 100)
@@ -12,13 +12,13 @@
 \tabular{ll}{
 Package: \tab picante\cr
 Type: \tab Package\cr
-Version: \tab 0.1-2\cr
-Date: \tab 2008-05-30\cr
+Version: \tab 0.2-0\cr
+Date: \tab 2008-06-10\cr
 License: \tab GPL-2\cr
 }
 }
 \author{
-Steve Kembel <skembel at berkeley.edu>, David Ackerly <dackerly at berkeley.edu>, Simon Blomberg <s.blomberg1 at uq.edu.au>, Peter Cowan <pdc at berkeley.edu>, Cam Webb <cwebb at oeb.harvard.edu>
+Steve Kembel <skembel at berkeley.edu>, David Ackerly <dackerly at berkeley.edu>, Simon Blomberg <s.blomberg1 at uq.edu.au>, Peter Cowan <pdc at berkeley.edu>, Matthew Helmus <mrhelmus at wisc.edu>, Cam Webb <cwebb at oeb.harvard.edu>
 
 Maintainer: Steve Kembel <skembel at berkeley.edu>
 }