summaryrefslogtreecommitdiff
path: root/doc/release-notes.inc
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2016-07-04 23:47:24 +0200
committerBdale Garbee <bdale@gag.com>2016-07-04 23:47:24 +0200
commit2e26d1ab42163988dc26b06b016c3b05efe17659 (patch)
tree5736db47fa979abb0e37b0fc3b956cd6cdbe9405 /doc/release-notes.inc
parent639e461ded29a48c155afea12171cbfc191ccfd7 (diff)
parent65ed2f588ca596fe9aa559bebd590a2a11b9859b (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, 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[]