From 7fa9f9bc87ea627a157a43934b739b0267afd1e2 Mon Sep 17 00:00:00 2001
From: Adolfo Rodriguez Tsouroukdissian <adolfo.rodriguez@pal-robotics.com>
Date: Fri, 31 Oct 2014 11:56:43 +0100
Subject: [PATCH] Update changelog

---
 CHANGELOG.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e6a1ed40..16413c7c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package control_toolbox
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Forthcoming
+-----------
+* Harmonize pid gain names between rosparam and dynamic_reconfigure
+* Read i_clamp_min and i_clamp_max form parameter server - if available
+* Contributors: Adolfo Rodriguez Tsouroukdissian, Dave Coleman, ipa-fxm
+
 1.12.1 (2014-06-12)
 -------------------
 * Remove broken test code. Hotfix for `#18 <https://github.com/ros-controls/control_toolbox/issues/18>`_.