[ompl: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/ompl

[rmattes]

commit 53e8e7950335532e36378db1b423502ad1c8f23d
Merge: a7b4271 36a2d56
Author: Rich Mattes <richmattes at gmail.com>
Date:   Fri May 30 21:43:27 2014 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/ompl
    
    Conflicts:
    	ompl.spec

 ompl.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc ompl.spec
index c55f410,9b9ec9f..ad8e4b0
--- a/ompl.spec
+++ b/ompl.spec
@@@ -94,9 -92,9 +94,12 @@@ make -C build test || exit 
  %{_datadir}/cmake/Modules/FindOMPL.cmake
  
  %changelog
 +* Fri May 30 2014 Rich Mattes <rmattes at fedoraproject.org> - 0.14.2-1
 +- Update to release 0.14.2
 +
+ * Thu May 22 2014 Petr Machata <pmachata at redhat.com> - 0.13.0-2
+ - Rebuild for boost 1.55.0
+ 
  * Wed Aug 21 2013 Rich Mattes <richmattes at gmail.com> - 0.13.0-1
  - Update to release 0.13.0