From 028bfcf52e00d05fa2454a0b35073dc7ca016068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathieu=20Labb=C3=A9?= <matlabbe@gmail.com>
Date: Fri, 10 Jul 2015 16:00:34 -0400
Subject: [PATCH] Updated version to 0.6.0

---
 CMakeLists.txt        | 2 +-
 src/AboutDialog.cpp   | 2 +-
 src/ui/aboutDialog.ui | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86ac821..1dc4c2a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ ENDIF()
 #######################
 # VERSION
 #######################
-SET(PROJECT_VERSION "0.5.1")
+SET(PROJECT_VERSION "0.6.0")
 SET(PROJECT_PREFIX find_object)
 
 STRING(REGEX MATCHALL "[0-9]" PROJECT_VERSION_PARTS "${PROJECT_VERSION}")
diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp
index dd7d601..6f3fd89 100644
--- a/src/AboutDialog.cpp
+++ b/src/AboutDialog.cpp
@@ -40,7 +40,7 @@ AboutDialog::AboutDialog(QWidget * parent) :
 	ui_->label_version->setText(PROJECT_VERSION);
 
 	QString cv_version = CV_VERSION;
-	#if RTABMAP_NONFREE == 1
+	#if FINDOBJECT_NONFREE == 1
 		cv_version.append(" [With nonfree]");
 	#else
 		cv_version.append(" [Without nonfree]");
diff --git a/src/ui/aboutDialog.ui b/src/ui/aboutDialog.ui
index c26ec7c..d67f997 100644
--- a/src/ui/aboutDialog.ui
+++ b/src/ui/aboutDialog.ui
@@ -185,7 +185,7 @@ p, li { white-space: pre-wrap; }
         <item>
          <widget class="QLabel" name="label_5">
           <property name="text">
-           <string>Copyright (C) 2011 IntRoLab - Université de Sherbrooke</string>
+           <string>Copyright (C) 2011-2015 IntRoLab - Université de Sherbrooke</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>