Merge pull request #2 from ropensci/ggplotly

py$ggplotly(gg)

Author: sckott

.gitignore

@@ -1,3 +1,5 @@
 R/.Rhistory
 Rapp.history
 /Karthik_local.R
+*~
+.Rhistory

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: plotly
 Type: Package
 Title: Interactive, publication-quality graphs online.
-Version: 0.3.5
+Version: 0.3.6
 Authors@R: c(person("Chris", "Parmer", role = c("aut", "cre"),
     email = "[email protected]"),
     person("Scott", "Chamberlain", role = "aut",
@@ -19,6 +19,11 @@ URL: https://github.com/ropensci/plotly
 BugReports: https://github.com/ropensci/plotly/issues
 Depends:
     RCurl,
-    RJSONIO
+    RJSONIO,
+    ggplot2,
+    plyr
 Imports:
     knitr
+Suggests:
+    maps,
+    testthat

NAMESPACE

@@ -1,5 +1,11 @@
+export(getLegendList)
+export(gg2list)
+export(layer2list)
 export(plotly)
 export(signup)
+export(toRGB)
 import(RCurl)
 import(RJSONIO)
+import(ggplot2)
 import(knitr)
+import(plyr)

NEWS

@@ -0,0 +1,5 @@
+0.3.6 -- 10 March 2014.
+
+Merge ggplotly code.
+
+0.3.5