Merge branch 'Spectra_online'

gabraham · Dec 16, 2016 · 00ff291 · 00ff291
2 parents 35a6bbe + 9405563
commit 00ff291
Show file tree

Hide file tree

Showing 80 changed files with 38,970 additions and 1,857 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,7 @@
 .RDataTmp
 .Rhistory
 .Rproj.user
+*.bed
+*.bim
+*.fam
+*.log
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,8 @@
+Version 2.0
+15-Dec-2016
+* New algorithm for PCA
+* New flashpcaR
+
 Version 1.2.6
 24-Mar-2016
 * Improvements in SCCA, especially flashpcaR::scca

diff --git a/HapMap3/1kg.ref.phase1_release_v3.20101123_thinned_autosomal_overlap.bed b/HapMap3/1kg.ref.phase1_release_v3.20101123_thinned_autosomal_overlap.bed