summaryrefslogtreecommitdiff
path: root/doc/release-notes.inc
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2017-09-18 20:46:47 -0600
committerBdale Garbee <bdale@gag.com>2017-09-18 20:46:47 -0600
commit3ead5d54135003702f771191d2c53abb584d1695 (patch)
tree03f812123642d41215fbc67ff6a308fb2906d77a /doc/release-notes.inc
parentb94d18396f050b61a5671b4239d2a3eb9b7a835c (diff)
parent216ea6388a75c46891dc4687a2eb0c97dc63b136 (diff)
Merge branch 'branch-1.8' 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 adcf57ed..a102b2dc 100644
--- a/doc/release-notes.inc
+++ b/doc/release-notes.inc
@@ -2,6 +2,10 @@
== Release Notes
:leveloffset: 2
+ include::release-notes-1.8.2.raw[]
+
+ <<<<
+ :leveloffset: 2
include::release-notes-1.8.1.raw[]
<<<<