diff options
| author | Bdale Garbee <bdale@gag.com> | 2017-12-21 19:07:13 -0700 | 
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2017-12-21 19:07:13 -0700 | 
| commit | 456c27a7ed26e4edde02aa0a0b8ef4f46f1ea464 (patch) | |
| tree | 7c259a612e315ac439c2d6ac87e08f6c67b68485 /doc/telegps-release-notes.inc | |
| parent | fe2fe0f4b8382d7e0a5eceaeccced28ef004dab8 (diff) | |
| parent | 16a9d8617b2d2092d166a85ada4349601afb0dce (diff) | |
Merge branch 'branch-1.8' into debian
Diffstat (limited to 'doc/telegps-release-notes.inc')
| -rw-r--r-- | doc/telegps-release-notes.inc | 5 | 
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/telegps-release-notes.inc b/doc/telegps-release-notes.inc index 0c506c28..5c5da8f6 100644 --- a/doc/telegps-release-notes.inc +++ b/doc/telegps-release-notes.inc @@ -2,6 +2,11 @@  == Release Notes  	:leveloffset: 2 +	include::release-notes-1.8.4.raw[] + +	<<<< + +	:leveloffset: 2  	include::release-notes-1.8.3.raw[]  	<<<<  | 
