diff options
| author | igor@rurik.mysql.com <> | 2005-03-09 10:58:52 -0800 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2005-03-09 10:58:52 -0800 |
| commit | af5d21357ed7293b7d491d90b778209a7dd3f21e (patch) | |
| tree | 9003f0838a291edb951f927a9de4ed0c93e8a96b /Docs | |
| parent | 3ce3295e3fd775f70a5d61e5e0c3424e83131f2b (diff) | |
| parent | 4559fb998b8b9cc76e7801933889fbbeba05eb3a (diff) | |
| download | mariadb-git-af5d21357ed7293b7d491d90b778209a7dd3f21e.tar.gz | |
Manual merge
Diffstat (limited to 'Docs')
| -rwxr-xr-x | Docs/changelog-4.0.xml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/Docs/changelog-4.0.xml b/Docs/changelog-4.0.xml new file mode 100755 index 00000000000..f0f9aa881f1 --- /dev/null +++ b/Docs/changelog-4.0.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" +"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> +<!-- +This is a dummy changelog file. Don't use it yet. +It merges upward without conflict. +--> +<appendix id="news-4-0-x"> + + <title> + Changes in release 4.0.x + </title> + + <para> + This is a dummy changelog file. Don't use it yet. + </para> + +</appendix> |