summaryrefslogtreecommitdiff
path: root/doc/release-notes.inc
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2016-05-06 18:13:12 -0600
committerBdale Garbee <bdale@gag.com>2016-05-06 18:13:12 -0600
commit4c20fdfa543059739b756171b991d430789cded1 (patch)
treef39e6c729364211bf0570c459c37b576ecf9faa9 /doc/release-notes.inc
parente58dd78bcb749315f84168c83a74cf80851bf815 (diff)
parent2f0c977c747824d0798550ac64eceb1d66c50efd (diff)
Merge branch 'branch-1.6' into debian
Diffstat (limited to 'doc/release-notes.inc')
-rw-r--r--doc/release-notes.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/release-notes.inc b/doc/release-notes.inc
index a6240d43..35ffa0d1 100644
--- a/doc/release-notes.inc
+++ b/doc/release-notes.inc
@@ -2,6 +2,10 @@
== Release Notes
:leveloffset: 2
+ include::release-notes-1.6.3.raw[]
+
+ <<<<
+ :leveloffset: 2
include::release-notes-1.6.2.raw[]
<<<<