version bump

Davide Faconti · Davide Faconti · commit 31da83cd870e · 2018-12-05T10:02:28.000+01:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,25 @@
 Changelog for package behaviortree_cpp
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Forthcoming
+-----------
+* Merge pull request #27 from mjeronimo/bt-12-4-2018
+  Add support for ament/colcon build
+* updated documentation
+* Merge pull request #25 from BehaviorTree/include_xml
+  Add the ability to include an XML from another one
+* <include> supports ROS package getPath (issue #17)
+* Trying to fix writeXML (issue #24)
+* New feature: include XMl from other XMLs (issue #17)
+* more verbose error message
+* adding unit tests for Repeat and Retry nodes #23
+* Bug fix in Retry and Repeat Decorators (needs unit test)
+* Throw if the parameter in blackboard can't be read
+* Try to prevent error #22 in user code
+* changed the protocol of the XML
+* fixing issue #22
+* Contributors: Davide Faconti, Michael Jeronimo
+
 2.3.0 (2018-11-28)
 ------------------
 * Fix: registerBuilder did not register the manifest. It was "broken" as public API method
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 ![License MIT](https://img.shields.io/dub/l/vibe-d.svg)
-![Version](https://img.shields.io/badge/version-v2.3-green.svg)
+![Version](https://img.shields.io/badge/version-v2.4-green.svg)
 [![Build Status](https://travis-ci.org/BehaviorTree/BehaviorTree.CPP.svg?branch=master)](https://travis-ci.org/BehaviorTree/BehaviorTree.CPP)
 
 # About BehaviorTree.CPP
