summaryrefslogtreecommitdiff
path: root/doc/release-notes.inc
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2016-06-17 10:02:00 -0600
committerBdale Garbee <bdale@gag.com>2016-06-17 10:02:00 -0600
commit085336c45ce0577031a7af5de117a8b856160708 (patch)
tree13a145eab69e38f2658359fa8395e7257b3c3fb9 /doc/release-notes.inc
parent50c9a54ac6b04458970eedfa6d3e0e25f41c765f (diff)
parent639e461ded29a48c155afea12171cbfc191ccfd7 (diff)
Merge branch 'branch-1.6' into debian
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[]
<<<<