From 53e8e7950335532e36378db1b423502ad1c8f23d Mon Sep 17 00:00:00 2001
From: Rich Mattes <richmattes@gmail.com>
Date: May 31 2014 01:43:27 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/ompl


Conflicts:
	ompl.spec

---

diff --git a/ompl.spec b/ompl.spec
index c55f410..ad8e4b0 100644
--- a/ompl.spec
+++ b/ompl.spec
@@ -97,6 +97,9 @@ make -C build test || exit 0
 * Fri May 30 2014 Rich Mattes <rmattes@fedoraproject.org> - 0.14.2-1
 - Update to release 0.14.2
 
+* Thu May 22 2014 Petr Machata <pmachata@redhat.com> - 0.13.0-2
+- Rebuild for boost 1.55.0
+
 * Wed Aug 21 2013 Rich Mattes <richmattes@gmail.com> - 0.13.0-1
 - Update to release 0.13.0