[Patchwork-commits] r202 - .git .git/logs .git/logs/refs/heads .git/logs/refs/remotes/origin .git/refs/heads .git/refs/remotes/origin pkg/TAPS/R

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

Author: sebastian_d
Date: 2014-01-14 16:14:13 +0100 (Tue, 14 Jan 2014)
New Revision: 202

Modified:
   .git/COMMIT_EDITMSG
   .git/index
   .git/logs/HEAD
   .git/logs/refs/heads/master
   .git/logs/refs/remotes/origin/master
   .git/refs/heads/master
   .git/refs/remotes/origin/master
   pkg/TAPS/R/TAPS.r
Log:
small fix xlsx

Modified: .git/COMMIT_EDITMSG
===================================================================
--- .git/COMMIT_EDITMSG	2014-01-14 15:12:43 UTC (rev 201)
+++ .git/COMMIT_EDITMSG	2014-01-14 15:14:13 UTC (rev 202)
@@ -1 +1 @@
-update to xlsx handling (barely needed anymore)
+small fix xlsx

Modified: .git/index
===================================================================
(Binary files differ)

Modified: .git/logs/HEAD
===================================================================
--- .git/logs/HEAD	2014-01-14 15:12:43 UTC (rev 201)
+++ .git/logs/HEAD	2014-01-14 15:14:13 UTC (rev 202)
@@ -79,3 +79,4 @@
 c66991c3bf461c1c1ad49a9f3381716cefcc0e32 1c3b0b54598dac7863316a79427364b873bec3f3 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1389602878 +0100	commit: 2014 making sure everything is synced rforge/git
 1c3b0b54598dac7863316a79427364b873bec3f3 78c55c83e03724a24900fbaf881864197d23ab4d Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1389602903 +0100	pull: Merge made by the 'recursive' strategy.
 78c55c83e03724a24900fbaf881864197d23ab4d 218c5c8fe2ba9eb21c155ba9c5696b8eebfb90e8 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1389712335 +0100	commit: update to xlsx handling (barely needed anymore)
+218c5c8fe2ba9eb21c155ba9c5696b8eebfb90e8 a4cb05b888a8eef33784f0ee1fb4f2de5a8c3c61 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1389712434 +0100	commit: small fix xlsx

Modified: .git/logs/refs/heads/master
===================================================================
--- .git/logs/refs/heads/master	2014-01-14 15:12:43 UTC (rev 201)
+++ .git/logs/refs/heads/master	2014-01-14 15:14:13 UTC (rev 202)
@@ -79,3 +79,4 @@
 c66991c3bf461c1c1ad49a9f3381716cefcc0e32 1c3b0b54598dac7863316a79427364b873bec3f3 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1389602878 +0100	commit: 2014 making sure everything is synced rforge/git
 1c3b0b54598dac7863316a79427364b873bec3f3 78c55c83e03724a24900fbaf881864197d23ab4d Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1389602903 +0100	pull: Merge made by the 'recursive' strategy.
 78c55c83e03724a24900fbaf881864197d23ab4d 218c5c8fe2ba9eb21c155ba9c5696b8eebfb90e8 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1389712335 +0100	commit: update to xlsx handling (barely needed anymore)
+218c5c8fe2ba9eb21c155ba9c5696b8eebfb90e8 a4cb05b888a8eef33784f0ee1fb4f2de5a8c3c61 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1389712434 +0100	commit: small fix xlsx

Modified: .git/logs/refs/remotes/origin/master
===================================================================
--- .git/logs/refs/remotes/origin/master	2014-01-14 15:12:43 UTC (rev 201)
+++ .git/logs/refs/remotes/origin/master	2014-01-14 15:14:13 UTC (rev 202)
@@ -76,3 +76,4 @@
 c66991c3bf461c1c1ad49a9f3381716cefcc0e32 65601241ae236432ef8a7f3aab8d7af3068d4344 Sebastian DiLorenzo <S_D at array-47-13.medsci.uu.se> 1389602902 +0100	pull: fast-forward
 65601241ae236432ef8a7f3aab8d7af3068d4344 78c55c83e03724a24900fbaf881864197d23ab4d Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1389602990 +0100	update by push
 78c55c83e03724a24900fbaf881864197d23ab4d 218c5c8fe2ba9eb21c155ba9c5696b8eebfb90e8 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1389712343 +0100	update by push
+218c5c8fe2ba9eb21c155ba9c5696b8eebfb90e8 a4cb05b888a8eef33784f0ee1fb4f2de5a8c3c61 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1389712440 +0100	update by push

Modified: .git/refs/heads/master
===================================================================
--- .git/refs/heads/master	2014-01-14 15:12:43 UTC (rev 201)
+++ .git/refs/heads/master	2014-01-14 15:14:13 UTC (rev 202)
@@ -1 +1 @@
-218c5c8fe2ba9eb21c155ba9c5696b8eebfb90e8
+a4cb05b888a8eef33784f0ee1fb4f2de5a8c3c61

Modified: .git/refs/remotes/origin/master
===================================================================
--- .git/refs/remotes/origin/master	2014-01-14 15:12:43 UTC (rev 201)
+++ .git/refs/remotes/origin/master	2014-01-14 15:14:13 UTC (rev 202)
@@ -1 +1 @@
-218c5c8fe2ba9eb21c155ba9c5696b8eebfb90e8
+a4cb05b888a8eef33784f0ee1fb4f2de5a8c3c61

Modified: pkg/TAPS/R/TAPS.r
===================================================================
--- pkg/TAPS/R/TAPS.r	2014-01-14 15:12:43 UTC (rev 201)
+++ pkg/TAPS/R/TAPS.r	2014-01-14 15:14:13 UTC (rev 202)
@@ -1396,7 +1396,7 @@
 ### Function for summarizing alteration frquencies in X samples
 TAPS_freq <- function(samples='all', outdir='frequencies', hg19=T) {
     
-    suppressPackageStartupMessages(library(xlsx))    
+    #suppressPackageStartupMessages(library(xlsx))    
     
     sampleData <- load.txt('SampleData.csv')
     olddir <- getwd()
@@ -1559,7 +1559,7 @@
 ########### Group comparisons
 TAPS_compare <- function(grp1, grp2, name1='1', name2='2', outdir='frequencies_comp', hg19=T) {
     
-    suppressPackageStartupMessages(library(xlsx))    
+    #suppressPackageStartupMessages(library(xlsx))    
 
     sampleData=load.txt('SampleData.csv')