summaryrefslogtreecommitdiff
path: root/doc/release-notes.inc
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2017-08-12 00:59:03 -0400
committerBdale Garbee <bdale@gag.com>2017-08-12 00:59:03 -0400
commit59c6167b9f1e9de30455af1632e9a0b65d64ad63 (patch)
treed27e4b3df53300081aa6ac0a30820c58a1c968ef /doc/release-notes.inc
parent41eedf88751910ea9c0a299444fbac769edb8427 (diff)
parentfccfa54bb3b746cecfcdc1fd497cf736bbfe3ef3 (diff)
Merge branch 'branch-1.8' 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 86ce95d3..e52e36b5 100644
--- a/doc/release-notes.inc
+++ b/doc/release-notes.inc
@@ -2,6 +2,11 @@
== Release Notes
:leveloffset: 2
+ include::release-notes-1.8.raw[]
+
+ <<<<
+
+ :leveloffset: 2
include::release-notes-1.7.raw[]
<<<<