summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-19 01:48:06 -0500
committerChris McDonough <chrism@plope.com>2011-01-19 01:48:06 -0500
commitacc2a6e7159e6f6fd9eb67e312c74ebc690287d9 (patch)
tree3fc4a3674da043c3722aa6bbb36af85499a7ac11
parent78fe62ae55a25ada43b9eaaf454d9e7044981a2d (diff)
downloadpyramid-acc2a6e7159e6f6fd9eb67e312c74ebc690287d9.tar.gz
pyramid-acc2a6e7159e6f6fd9eb67e312c74ebc690287d9.tar.bz2
pyramid-acc2a6e7159e6f6fd9eb67e312c74ebc690287d9.zip
Add changelog entry about merging caseman-master
-rw-r--r--CHANGES.txt9
1 files changed, 9 insertions, 0 deletions
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)
===================