Browse code

version bump

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/crlmm@82281 bc3139a8-67e5-0310-9ffc-ced21a209358

Rob Scharp authored on 31/10/2013 01:45:39
Showing1 changed files

... ...
@@ -1,13 +1,8 @@
1 1
 Package: crlmm
2 2
 Type: Package
3 3
 Title: Genotype Calling (CRLMM) and Copy Number Analysis tool for Affymetrix SNP 5.0 and 6.0 and Illumina arrays.
4
-<<<<<<< HEAD
5
-Version: 1.21.0
6
-Date: Wed Oct 30 21:27:01 EDT 2013
7
-=======
8
-Version: 1.19.9
9
-Date: Fri Oct 25 14:00:41 EDT 2013
10
->>>>>>> 9a92fa5d0719c007647a5b14c24201d277db3f1b
4
+Version: 1.21.1
5
+Date: Wed Oct 30 21:42:52 EDT 2013
11 6
 Author: Benilton S Carvalho, Robert Scharpf, Matt Ritchie, Ingo Ruczinski, Rafael A Irizarry
12 7
 Maintainer: Benilton S Carvalho <Benilton.Carvalho@cancer.org.uk>, Robert Scharpf <rscharpf@jhsph.edu>, Matt Ritchie <mritchie@wehi.EDU.AU>
13 8
 Description: Faster implementation of CRLMM specific to SNP 5.0 and 6.0 arrays, as well as a copy number tool specific to 5.0, 6.0, and Illumina platforms