summaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2017-08-29 21:37:51 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2017-08-29 21:37:51 +0100
commit2248b886fe8bfc65d42db08350cf2edb380e2473 (patch)
tree86826c6280f2ee0a64989639adc68c1b77c1f741 /CHANGES
parent82b30f23226ce6bb19bc89070569a2b92cee4cc8 (diff)
2.6-rc version.
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index eb86c8af..6cf34d9f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-CHANGES FROM 2.5 TO master
+CHANGES FROM 2.5 TO 2.6-rc, 29 August 2017
* Reorder how keys are checked to allow keys to be specified that have a
leading escape. GitHub issue 1048.