From caa079850391aa818b36815bfafb9f5b506a5238 Mon Sep 17 00:00:00 2001
From: Stephen Boddy <stephen.j.boddy@gmail.com>
Date: Tue, 1 Dec 2015 20:19:36 +0100
Subject: [PATCH] Add Changelog entry

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d0b668cb..52d93e5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,8 @@ terminator trunk:
       (Steve Boddy)
     * Updated and grouped default shortcuts in man page (Steve Boddy)
     * Added smart copy mode switch to prefs (Steve Boddy, LP#1223129)
+    * Merge feature branch for tab/terminal title editing (Haim
+      Daniel LP#1417747)
     * Make Zoom/Maximize inactive if a single terminal (Egmont
       Koblinger, LP#1518081)
     * Add dimming for 256 colour palettes (Egmont Koblinger,