diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-09-05 21:01:35 -0600 | 
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-09-05 21:01:35 -0600 | 
| commit | 6af87e5cf98e644d2455faf6526a9f11880686f5 (patch) | |
| tree | d23017ea0a0fd693cbef18979c35cfca7ce1db69 /doc/release-notes.inc | |
| parent | 6ec9f2a78aa8c99d48006b14c936c59edd08addf (diff) | |
| parent | 168c39a37415b1bdc09aa00bbaaafb5d879ce8bd (diff) | |
Merge branch 'branch-1.6' 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 b8b34e7b..7cd075f6 100644 --- a/doc/release-notes.inc +++ b/doc/release-notes.inc @@ -2,6 +2,10 @@  == Release Notes  	:leveloffset: 2 +	include::release-notes-1.6.8.raw[] + +	<<<< +	:leveloffset: 2  	include::release-notes-1.6.5.raw[]  	<<<< | 
