diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-09-05 20:59:11 -0600 | 
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-09-05 20:59:11 -0600 | 
| commit | c0ad087008856cfc2233b977abfc3f1dcbaccdcc (patch) | |
| tree | adc46abc430793112858ce5d1822d3fe0a395e71 /doc/release-notes.inc | |
| parent | 148b013dd29c26920ddfb53449ed4d8cc5a4b5ee (diff) | |
| parent | 4fdf8ca9ca1cd5a84b03bd7a03c5806af64b413d (diff) | |
Merge branch 'master' into branch-1.6
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[]  	<<<< | 
