Merge branch 'ubsan-fix' v.1.1.2

Conflicts: DESCRIPTION NEWS src/poppr_distance.c vignettes/algo.Rnw vignettes/algo.pdf vignettes/algo.tex vignettes/poppr_manual.Rnw vignettes/poppr_manual.pdf
grunwaldlab · Jul 29, 2014 · 32f5e03 · 32f5e03
2 parents c0f9316 + 33d6a4e
commit 32f5e03
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 0 deletions.
diff --git a/vignettes/algo.pdf b/vignettes/algo.pdf
diff --git a/vignettes/poppr_manual.pdf b/vignettes/poppr_manual.pdf