From acc2a6e7159e6f6fd9eb67e312c74ebc690287d9 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 19 Jan 2011 01:48:06 -0500
Subject: Add changelog entry about merging caseman-master

---
 CHANGES.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'CHANGES.txt')

diff --git a/CHANGES.txt b/CHANGES.txt
index 71982e78b..01b330b1d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,12 @@
+Next release
+============
+
+Documentation
+-------------
+
+- Merged caseman-master narrative editing branch, many wording fixes and
+  extensions.
+
 1.0a10 (2011-01-18)
 ===================
 
-- 
cgit v1.2.3