git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/crlmm@49134 bc3139a8-67e5-0310-9ffc-ced21a209358
Rob Scharp authored on 30/08/2010 19:40:48
| ... | ... |
@@ -1,13 +1,11 @@ |
| 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.7.12 |
|
| 6 |
-Date: 2010-08-25 |
|
| 7 |
-======= |
|
| 4 |
+Package: crlmm |
|
| 5 |
+Type: Package |
|
| 6 |
+Title: Genotype Calling (CRLMM) and Copy Number Analysis tool for Affymetrix SNP 5.0 and 6.0 and Illumina arrays. |
|
| 8 | 7 |
Version: 1.7.13 |
| 9 |
-Date: 2010-07-30 |
|
| 10 |
->>>>>>> bumped to version 1.7.13 |
|
| 8 |
+Date: 2010-08-25 |
|
| 11 | 9 |
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 |
| 12 | 10 |
Maintainer: Benilton S Carvalho <carvalho@bclab.org>, Robert Scharpf <rscharpf@jhsph.edu>, Matt Ritchie <mritchie@wehi.EDU.AU> |
| 13 | 11 |
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 |
| ... | ... |
@@ -45,3 +43,4 @@ Collate: AllGenerics.R |
| 45 | 43 |
zzz.R |
| 46 | 44 |
LazyLoad: yes |
| 47 | 45 |
biocViews: Microarray, Preprocessing, SNP, Bioinformatics, CopyNumberVariants |
| 46 |
+ |