version bump

grunwaldlab · Jul 29, 2014 · 33d6a4e · 33d6a4e
1 parent 8545811
commit 33d6a4e
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 7 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: poppr
 Type: Package
 Title: an R package for genetic analysis of populations with mixed
     reproduction
-Version: 1.1.2.99
+Version: 1.1.2
 Date: 2014-07-26
 Author: Zhian N. Kamvar <[email protected]>, Javier F. Tabima
     <[email protected]>, Niklaus J. Grunwald

diff --git a/NEWS b/NEWS
@@ -1,5 +1,8 @@
-poppr 1.1.2.99
+poppr 1.1.2
 ===========
+BUG FIX
+* Fixed memory allocation bug (Further addresses issue #2).
+* Memory allocated in C function bruvo_dist is now properly freed.
 
 poppr 1.1.1
 ===========

diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ If you want the absolute latest version of *poppr*, see about installing from gi
 
 ### Stable and Development versions
 
-[![Build Status](https://travis-ci.org/grunwaldlab/poppr.png?branch=devel)](https://travis-ci.org/grunwaldlab/poppr?branch=devel)
+[![Build Status](https://travis-ci.org/grunwaldlab/poppr.png?branch=master)](https://travis-ci.org/grunwaldlab/poppr?branch=master)
 
 If the image above says "Passing", then that means it should be safe to install with the latest version of R. If it does not say "Passing", I am probably trying to fix whatever problem is causing it as fast as I can.
 

diff --git a/vignettes/algo.Rnw b/vignettes/algo.Rnw
@@ -51,7 +51,7 @@
   \scalebox{-1}[1]{\jala{}}
 }
 
-\title{Algorithms and equations utilized in poppr version 1.1.2.99}
+\title{Algorithms and equations utilized in poppr version 1.1.2}
 \author{Zhian N. Kamvar$^{1}$\ and Niklaus J. Gr\"unwald$^{1,2}$\\\scriptsize{1)
 Department of Botany and Plant Pathology, Oregon State University, Corvallis,
 OR}\\\scriptsize{2) Horticultural Crops Research Laboratory, USDA-ARS,
@@ -552,4 +552,4 @@ genotypes observed and $N$ is the sample size.
 
 \bibliographystyle{plain}
 \bibliography{poppr_man}
-\end{document}
+\end{document}
diff --git a/vignettes/algo.pdf b/vignettes/algo.pdf
diff --git a/vignettes/algo.tex b/vignettes/algo.tex
@@ -100,7 +100,7 @@
   \scalebox{-1}[1]{\jala{}}
 }
 
-\title{Algorithms and equations utilized in poppr version 1.1.1}
+\title{Algorithms and equations utilized in poppr version 1.1.2}
 \author{Zhian N. Kamvar$^{1}$\ and Niklaus J. Gr\"unwald$^{1,2}$\\\scriptsize{1)
 Department of Botany and Plant Pathology, Oregon State University, Corvallis,
 OR}\\\scriptsize{2) Horticultural Crops Research Laboratory, USDA-ARS,

diff --git a/vignettes/poppr_manual.Rnw b/vignettes/poppr_manual.Rnw
@@ -51,7 +51,7 @@
   \scalebox{-1}[1]{\jala{}}
 }
 
-\title{Data import and manipulation in Poppr version 1.1.2.99}
+\title{Data import and manipulation in poppr version 1.1.2}
 \author{Zhian N. Kamvar$^{1}$\ and Niklaus J. Gr\"unwald$^{1,2}$\\\scriptsize{1)
 Department of Botany and Plant Pathology, Oregon State University, Corvallis,
 OR}\\\scriptsize{2) Horticultural Crops Research Laboratory, USDA-ARS,

diff --git a/vignettes/poppr_manual.pdf b/vignettes/poppr_manual.pdf