Merge branch 'development'

BIMIB-DISCo · Aug 14, 2015 · a8b3d8d · a8b3d8d
2 parents 718764d + a5b0abb
commit a8b3d8d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: TRONCO
 Version: 2.0.0-13
-Date: 2015-08-13
+Date: 2015-08-14
 Title: TRONCO, an package for TRanslational ONCOlogy
 Authors@R: 
     c(person("Marco", "Antoniotti", role=c("cph")), 

diff --git a/R/visualization.R b/R/visualization.R
@@ -1908,7 +1908,7 @@ likertToClus <- function(cluster_result, sample_stage, cluster_prefix='', sample
 #' separately one can cluster the rows in advance and show only the cluster centers. 
 #' The number of clusters can be tuned with parameter kmeans_k.
 #'
-#' This is a modified version of the real pheatmap 
+#' This is a modified version of the original pheatmap 
 #' (https://cran.r-project.org/web/packages/pheatmap/index.html)
 #' edited in accordance with GPL-2.
 #'

diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
@@ -2,7 +2,7 @@
 \title{Rgraphviz News}
 \encoding{UTF-8}
 
-\section{Version 2.0.0-12}{
+\section{Version 2.0.0-13}{
   \itemize{
     \item Beta release  
   }

diff --git a/inst/doc/vignette.pdf b/inst/doc/vignette.pdf
diff --git a/man/pheatmap.Rd b/man/pheatmap.Rd
@@ -173,7 +173,7 @@ clustering anymore, roughly more than 1000. Instead of showing all the rows
 separately one can cluster the rows in advance and show only the cluster centers.
 The number of clusters can be tuned with parameter kmeans_k.
 
-This is a modified version of the real pheatmap
+This is a modified version of the original pheatmap
 (https://cran.r-project.org/web/packages/pheatmap/index.html)
 edited in accordance with GPL-2.
 }