summaryrefslogtreecommitdiff
path: root/doc/release-notes.inc
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2016-07-04 23:48:32 +0200
committerBdale Garbee <bdale@gag.com>2016-07-04 23:48:32 +0200
commit06c3d5420080bc1c6fdfb213a9d616b75611c159 (patch)
treee882a83c3a76c82e3a8e832eb3805c0c5c010d0d /doc/release-notes.inc
parenteb5bd00b1c5045e64753ba9d066ef5cfce9d5a1e (diff)
parentea1ff225f1f450ee3fc377807d1bb7b982bf792d (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, 4 insertions, 1 deletions
diff --git a/doc/release-notes.inc b/doc/release-notes.inc
index 6ac90cfd..b8b34e7b 100644
--- a/doc/release-notes.inc
+++ b/doc/release-notes.inc
@@ -2,10 +2,13 @@
== Release Notes
:leveloffset: 2
- include::release-notes-1.6.4.raw[]
+ include::release-notes-1.6.5.raw[]
<<<<
+ :leveloffset: 2
+ include::release-notes-1.6.4.raw[]
+ <<<<
:leveloffset: 2
include::release-notes-1.6.3.raw[]