From 5ba840e58a35e2d14c40d0af807da879a1a2fd83 Mon Sep 17 00:00:00 2001
From: Armin Hornung <armin@hornung.io>
Date: Fri, 27 Nov 2015 16:44:48 +0100
Subject: [PATCH] Version 1.7.0 release

---
 dynamicEDT3D/CMakeLists.txt |  4 ++--
 dynamicEDT3D/package.xml    |  2 +-
 octomap/CHANGELOG.txt       | 10 ++++++++++
 octomap/CMakeLists.txt      |  4 ++--
 octomap/package.xml         |  2 +-
 octovis/CMakeLists.txt      |  4 ++--
 octovis/package.xml         |  2 +-
 7 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/dynamicEDT3D/CMakeLists.txt b/dynamicEDT3D/CMakeLists.txt
index 2debe960..cfc312ed 100644
--- a/dynamicEDT3D/CMakeLists.txt
+++ b/dynamicEDT3D/CMakeLists.txt
@@ -5,8 +5,8 @@ ENABLE_TESTING()
 
 # version (e.g. for packaging)
 set(DYNAMICEDT3D_MAJOR_VERSION 1)
-set(DYNAMICEDT3D_MINOR_VERSION 6)
-set(DYNAMICEDT3D_PATCH_VERSION 8)
+set(DYNAMICEDT3D_MINOR_VERSION 7)
+set(DYNAMICEDT3D_PATCH_VERSION 0)
 set(DYNAMICEDT3D_VERSION ${DYNAMICEDT3D_MAJOR_VERSION}.${DYNAMICEDT3D_MINOR_VERSION}.${DYNAMICEDT3D_PATCH_VERSION})
 set(DYNAMICEDT3D_SOVERSION ${DYNAMICEDT3D_MAJOR_VERSION}.${DYNAMICEDT3D_MINOR_VERSION})
 
diff --git a/dynamicEDT3D/package.xml b/dynamicEDT3D/package.xml
index de5c0fdc..b79de94f 100644
--- a/dynamicEDT3D/package.xml
+++ b/dynamicEDT3D/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>dynamic_edt_3d</name>
-  <version>1.6.8</version>
+  <version>1.7.0</version>
   <description> The dynamicEDT3D library implements an inrementally updatable Euclidean distance transform (EDT) in 3D. It comes with a wrapper to use the OctoMap 3D representation and hooks into the change detection of the OctoMap library to propagate changes to the EDT.</description>
 
   <author email="sprunkc@informatik.uni-freiburg.de">Christoph Sprunk</author>
diff --git a/octomap/CHANGELOG.txt b/octomap/CHANGELOG.txt
index 6ae9c5e2..b5bfe550 100644
--- a/octomap/CHANGELOG.txt
+++ b/octomap/CHANGELOG.txt
@@ -1,3 +1,13 @@
+v1.7.0: 2015-11-27
+==================
+- BBX iterators fixed for empty trees (thx to F. Boniardi)
+- graph2tree tool option for nodes in global frame
+- New octree2pointcloud PCL conversion tool (thx to F. Ferri)
+- Improved change detection / diff calculation (thx to C. Brew)
+- getUnknownLeafCenters now allows queries at a specified depth (thx to 
+  A. Ecins)
+- Fixed hashing overflow with clang (thx to L. Riano)
+
 v1.6.7: 2014-08-31
 ==================
 - FSF address in octovis license header for OctoMap package in Fedora
diff --git a/octomap/CMakeLists.txt b/octomap/CMakeLists.txt
index 2547ca09..026bf5a5 100644
--- a/octomap/CMakeLists.txt
+++ b/octomap/CMakeLists.txt
@@ -5,8 +5,8 @@ ENABLE_TESTING()
 
 # version (e.g. for packaging)
 set(OCTOMAP_MAJOR_VERSION 1)
-set(OCTOMAP_MINOR_VERSION 6)
-set(OCTOMAP_PATCH_VERSION 8)
+set(OCTOMAP_MINOR_VERSION 7)
+set(OCTOMAP_PATCH_VERSION 0)
 set(OCTOMAP_VERSION ${OCTOMAP_MAJOR_VERSION}.${OCTOMAP_MINOR_VERSION}.${OCTOMAP_PATCH_VERSION})
 set(OCTOMAP_SOVERSION ${OCTOMAP_MAJOR_VERSION}.${OCTOMAP_MINOR_VERSION})
 if(COMMAND cmake_policy)
diff --git a/octomap/package.xml b/octomap/package.xml
index 42803cff..303fb4ce 100644
--- a/octomap/package.xml
+++ b/octomap/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>octomap</name>
-  <version>1.6.8</version>
+  <version>1.7.0</version>
   <description>The OctoMap library implements a 3D occupancy grid mapping approach, providing data structures and mapping algorithms in C++. The map implementation is based on an octree. See
   http://octomap.github.io for details.</description>
 
diff --git a/octovis/CMakeLists.txt b/octovis/CMakeLists.txt
index d1c89e4c..db70854c 100644
--- a/octovis/CMakeLists.txt
+++ b/octovis/CMakeLists.txt
@@ -3,8 +3,8 @@ PROJECT( octovis )
 
 # # version (e.g. for packaging)
 set(OCTOVIS_MAJOR_VERSION 1)
-set(OCTOVIS_MINOR_VERSION 6)
-set(OCTOVIS_PATCH_VERSION 8)
+set(OCTOVIS_MINOR_VERSION 7)
+set(OCTOVIS_PATCH_VERSION 0)
 set(OCTOVIS_VERSION ${OCTOVIS_MAJOR_VERSION}.${OCTOVIS_MINOR_VERSION}.${OCTOVIS_PATCH_VERSION})
 set(OCTOVIS_SOVERSION ${OCTOVIS_MAJOR_VERSION}.${OCTOVIS_MINOR_VERSION})
 # get rid of a useless warning:
diff --git a/octovis/package.xml b/octovis/package.xml
index 819a6d26..e9f579a7 100644
--- a/octovis/package.xml
+++ b/octovis/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>octovis</name>
-  <version>1.6.8</version>
+  <version>1.7.0</version>
   <description>octovis is visualization tool for the OctoMap library based on Qt and libQGLViewer. See
   http://octomap.github.io for details.</description>