git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/crlmm@49133 bc3139a8-67e5-0310-9ffc-ced21a209358
Rob Scharp authored on 30/08/2010 19:40:46
| ... | ... |
@@ -1,8 +1,13 @@ |
| 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 |
|
| 4 | 5 |
Version: 1.7.12 |
| 5 | 6 |
Date: 2010-08-25 |
| 7 |
+======= |
|
| 8 |
+Version: 1.7.13 |
|
| 9 |
+Date: 2010-07-30 |
|
| 10 |
+>>>>>>> bumped to version 1.7.13 |
|
| 6 | 11 |
Author: Benilton S Carvalho <carvalho@bclab.org>, Robert Scharpf <rscharpf@jhsph.edu>, Matt Ritchie <mritchie@wehi.edu.au>, Ingo Ruczinski <iruczins@jhsph.edu>, Rafael A Irizarry |
| 7 | 12 |
Maintainer: Benilton S Carvalho <carvalho@bclab.org>, Robert Scharpf <rscharpf@jhsph.edu>, Matt Ritchie <mritchie@wehi.EDU.AU> |
| 8 | 13 |
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 |