[catkin-pkg] 04/04: update changelog

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to branch master
in repository catkin-pkg.

commit 082ff359f5fd8e43f1edabfce11a1368dc8c9454
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Thu Dec 11 10:17:02 2014 +0100

    update changelog
---
 debian/changelog | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 832fc0b..b77de57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+catkin-pkg (0.2.6-1) UNRELEASED; urgency=medium
+
+  [ Leopold Palomo-Avellaneda ]
+  * Merging control
+  * Imported Upstream version 0.2.6
+
+  [ Jochen Sprickerhof ]
+  * Revert upstream changes done while merging
+  * Fix mering errors (using new debrob version)
+  * Fix typos
+
+ -- Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>  Thu, 11 Dec 2014 10:16:31 +0100
+
 catkin-pkg (0.2.6-1.drp70+1) wheezy-robotics; urgency=medium
 
   * Rebuild fro drp.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/catkin-pkg.git