summaryrefslogtreecommitdiff
path: root/doc/release-notes.inc
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2016-06-17 10:00:10 -0600
committerBdale Garbee <bdale@gag.com>2016-06-17 10:00:10 -0600
commit31cf047113ec72a78f4b500223a2c6be23bc86fd (patch)
tree4f171ddf642fb06bd1b520cd98a242efe5f8320f /doc/release-notes.inc
parent2f0c977c747824d0798550ac64eceb1d66c50efd (diff)
parentafe74c067a31ce420d0d4cdac2069c1d258a5114 (diff)
Merge branch 'master' into branch-1.6
Diffstat (limited to 'doc/release-notes.inc')
-rw-r--r--doc/release-notes.inc5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/release-notes.inc b/doc/release-notes.inc
index 35ffa0d1..6ac90cfd 100644
--- a/doc/release-notes.inc
+++ b/doc/release-notes.inc
@@ -2,6 +2,11 @@
== Release Notes
:leveloffset: 2
+ include::release-notes-1.6.4.raw[]
+
+ <<<<
+
+ :leveloffset: 2
include::release-notes-1.6.3.raw[]
<<<<