merge into master

Merge branch 'dev' Conflicts: DESCRIPTION
gluc · Sep 8, 2015 · 899dedb · 899dedb
2 parents 458626e + fa378a0
commit 899dedb
Show file tree

Hide file tree

Showing 6 changed files with 402 additions and 442 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,14 +1,15 @@
 Package: data.tree
 Type: Package
 Title: General Purpose Hierarchical Data Structure
-Version: 0.2.0-4
-Date: 2015-09-07
+Version: 0.2.1
+Date: 2015-09-08
 Author: Christoph Glur
 Maintainer: Christoph Glur <christoph.glur@ipub.com>
 VignetteBuilder: knitr
 Imports:
     R6, stringr, methods
 Suggests:
+    graphics,
     testthat, 
     knitr, 
     ape, 
@@ -18,7 +19,6 @@ Suggests:
     DiagrammeR, 
     igraph,
     treemap,
-    curl,
     doParallel,
     foreach,
     htmlwidgets

diff --git a/data.tree.Rproj b/data.tree.Rproj
@@ -13,6 +13,7 @@ RnwWeave: knitr
 LaTeX: pdfLaTeX
 
 BuildType: Package
+PackageUseDevtools: Yes
 PackageInstallArgs: --no-multiarch --with-keep.source
 PackageBuildArgs: --resave-data
 PackageBuildBinaryArgs: --resave-data