summaryrefslogtreecommitdiff
path: root/doc/telegps-release-notes.inc
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2018-03-18 15:50:16 -0600
committerBdale Garbee <bdale@gag.com>2018-03-18 15:50:16 -0600
commit55b62bb5d6a9d6b484bcd0d802964d529dd5f9bb (patch)
tree1a93442d43fcad172879d76629d4ed47ce3d6575 /doc/telegps-release-notes.inc
parent558d2c94fe8c49d0544a3e7bc5ba11b60c4faa1e (diff)
parent59e23c27c2a85d7d748223e444b24d19937afe47 (diff)
Merge branch 'branch-1.8' into debian
Diffstat (limited to 'doc/telegps-release-notes.inc')
-rw-r--r--doc/telegps-release-notes.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/telegps-release-notes.inc b/doc/telegps-release-notes.inc
index 5c5da8f6..f451c2c8 100644
--- a/doc/telegps-release-notes.inc
+++ b/doc/telegps-release-notes.inc
@@ -2,10 +2,13 @@
== Release Notes
:leveloffset: 2
- include::release-notes-1.8.4.raw[]
+ include::release-notes-1.8.5.raw[]
<<<<
+ :leveloffset: 2
+ include::release-notes-1.8.4.raw[]
+ <<<<
:leveloffset: 2
include::release-notes-1.8.3.raw[]