summaryrefslogtreecommitdiff
path: root/doc/telegps-release-notes.inc
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2018-03-18 15:47:31 -0600
committerBdale Garbee <bdale@gag.com>2018-03-18 15:47:31 -0600
commit7b614380f307cb5e27f2a05281bc76c4ace93334 (patch)
treed243b069a134233f4b98e35769193a1244fc57f8 /doc/telegps-release-notes.inc
parent16a9d8617b2d2092d166a85ada4349601afb0dce (diff)
parent39023ed6e29103a85bfad505506fa0dbf4dc1112 (diff)
Merge branch 'master' into branch-1.8
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[]