Merge pull request #47 from ROBOTIS-GIT/kinetic-devel

robotpilot · web-flow · commit 8f59509bece2 · 2017-06-09T11:52:13.000+09:00
merge for sync kinetic-devel and master branch
diff --git a/robotis_controller/CHANGELOG.rst b/robotis_controller/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package robotis_controller
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.2.5 (2017-06-09)
+-----------
+* updated for yaml-cpp dependencies
+* Contributors: SCH
+
 0.2.4 (2017-06-07)
 -----------
 * added cmake_modules in package.xml
diff --git a/robotis_controller/package.xml b/robotis_controller/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>robotis_controller</name>
-  <version>0.2.4</version>
+  <version>0.2.5</version>
   <description>
     The main package that controls THORMANG3.
   </description>
diff --git a/robotis_device/CHANGELOG.rst b/robotis_device/CHANGELOG.rst
@@ -2,6 +2,10 @@
 Changelog for package robotis_device
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.2.5 (2017-06-09)
+-----------
+* none
+
 0.2.4 (2017-06-07)
 -----------
 * none
diff --git a/robotis_device/package.xml b/robotis_device/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>robotis_device</name>
-  <version>0.2.4</version>
+  <version>0.2.5</version>
   <description>
     The package that manages device information of ROBOTIS robots.
     This package is used when reading device information with the robot information file
diff --git a/robotis_framework/CHANGELOG.rst b/robotis_framework/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package robotis_framework
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.2.5 (2017-06-09)
+-----------
+* updated for yaml-cpp dependencies (robotis_controller)
+* Contributors: SCH
+
 0.2.4 (2017-06-07)
 -----------
 * added cmake_modules in package.xml
diff --git a/robotis_framework/package.xml b/robotis_framework/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>robotis_framework</name>
-  <version>0.2.4</version>
+  <version>0.2.5</version>
   <description>ROS packages for the robotis_framework (meta package)</description>
   <license>BSD</license>
   <author email="zerom@robotis.com">Zerom</author>
diff --git a/robotis_framework_common/CHANGELOG.rst b/robotis_framework_common/CHANGELOG.rst
@@ -2,6 +2,10 @@
 Changelog for package robotis_framework_common
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.2.5 (2017-06-09)
+-----------
+* none
+
 0.2.4 (2017-06-07)
 -----------
 * none
diff --git a/robotis_framework_common/package.xml b/robotis_framework_common/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>robotis_framework_common</name>
-  <version>0.2.4</version>
+  <version>0.2.5</version>
   <description>
     The package contains commonly used Headers for the ROBOTIS Framework.
   </description>
