Merge remote-tracking branch 'origin/release-1.2.0'

lloydc99 · Dec 30, 2015 · d2f2ebd · d2f2ebd
2 parents 6c4cd8e + c1e0266
commit d2f2ebd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,7 @@
+1.2.0 (2015-12-21)
+---------------------------------
+- No changes other than version bumps
+
 1.1.1 (2015-4-15)
 ---------------------------------
 - Updates baxter.sh to use a cross platform compatible command for making temporary directories

diff --git a/baxter_sdk/package.xml b/baxter_sdk/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>baxter_sdk</name>
-  <version>1.1.1</version>
+  <version>1.2.0</version>
   <description>
     baxter_sdk metapackage containing all of the SDK packages
     for the Baxter Research Robot from Rethink Robotics.