Merge remote-tracking branch 'origin/master' into develop

mojin-robotics · Apr 9, 2019 · 49fdd4b · 49fdd4b
2 parents a8882d7 + b2b3803
commit 49fdd4b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,15 @@
 Changelog for package flexbe_app
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.5 (2019-04-09)
+------------------
+* Merge remote-tracking branch 'origin/develop'
+* Merge pull request `#33 <https://github.com/FlexBE/flexbe_app/issues/33>`_ from henroth/master
+  Check that package.xml exists before trying to read it.
+* Fix indentation and variable declaration
+* Check that package.xml exists before trying to read it. Very old packages/stacks may not have a package.xml, but ros will report them as existing packages
+* Contributors: Henry Roth, Philipp Schillinger
+
 2.1.3 (2018-12-19)
 ------------------
 * Merge remote-tracking branch 'origin/develop'

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "FlexBE App",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "main": "src/main.js",
   "window": {
     "icon": "src/img/icon-128.png",

diff --git a/package.xml b/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>flexbe_app</name>
-  <version>2.1.4</version>
+  <version>2.1.5</version>
   <description>
      flexbe_app provides a user interface (editor + runtime control) for the FlexBE behavior engine.
   </description>