diff options
| author | Bdale Garbee <bdale@gag.com> | 2017-04-24 18:22:03 -0600 | 
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2017-04-24 18:22:03 -0600 | 
| commit | b91f67005709cb7f65e0a461b49b5cb0952cb391 (patch) | |
| tree | e9f6c0f30a81cf30a9cfd52887171168f7830f85 /doc/release-notes.inc | |
| parent | 1e956f93e0c9f8ed6180490f80e8aead5538f818 (diff) | |
| parent | 8a10ddb0bca7d6f6aa4aedda171899abd165fd74 (diff) | |
Merge branch 'branch-1.7' into debian
Diffstat (limited to 'doc/release-notes.inc')
| -rw-r--r-- | doc/release-notes.inc | 4 | 
1 files changed, 4 insertions, 0 deletions
| diff --git a/doc/release-notes.inc b/doc/release-notes.inc index 7cd075f6..86ce95d3 100644 --- a/doc/release-notes.inc +++ b/doc/release-notes.inc @@ -2,6 +2,10 @@  == Release Notes  	:leveloffset: 2 +	include::release-notes-1.7.raw[] + +	<<<< +	:leveloffset: 2  	include::release-notes-1.6.8.raw[]  	<<<< | 
