Fixing version number conflict

From: davismcc <[email protected]> git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/scater@124749 bc3139a8-67e5-0310-9ffc-ced21a209358
mimi3421 · Dec 2, 2016 · 16369f7 · 16369f7
1 parent e9eac70
commit 16369f7
Show file tree

Hide file tree

Showing 4 changed files with 177 additions and 123 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,11 @@
 .Rproj.user
 *.Rproj
 ^output*
+.Rhistory
+.RData
+.Ruserdata
+.Rbuildignore
+#Rcpp files
+src/*.o
+src/*.so
+src/*.dll
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -10,8 +10,8 @@ Authors@R: c(person("Davis", "McCarthy", role=c("aut", "cre"),
         "Kiselev", role=c("ctb"),
         email="[email protected]"), person("Aaron", "Lun", role = c("ctb"), 
         email="[email protected]"))
-Version: 1.3.0
-Date: 2016-10-14
+Version: 1.3.28
+Date: 2016-12-02
 License: GPL (>= 2)
 Title: Single-cell analysis toolkit for gene expression data in R
 Description: A collection of tools for doing various analyses of