From 5d2bbd50b0c39b938e7af7a5c526fdfb703d3885 Mon Sep 17 00:00:00 2001
From: Zhian Kamvar <kamvarz@science.oregonstate.edu>
Date: Tue, 12 May 2015 11:17:40 -0700
Subject: [PATCH] update version

---
 DESCRIPTION | 2 +-
 NEWS        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index e98b11c7..5e2926a1 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: poppr
 Type: Package
 Title: Genetic Analysis of Populations with Mixed Reproduction
-Version: 1.1.4.99-13
+Version: 1.1.5
 Date: 2015-05-11
 Authors@R: c(person(c("Zhian", "N."), "Kamvar", role = c("cre", "aut"),
     email = "kamvarz@science.oregonstate.edu"),
diff --git a/NEWS b/NEWS
index 77117ea1..1fb530e6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-poppr 1.1.4.99
+poppr 1.1.5
 ===========
 BUG FIX
 * Fixed internal bug for fix_negative_branch when only one branch had a negative edge.