summaryrefslogtreecommitdiff
path: root/Docs
diff options
context:
space:
mode:
authorkroki@mysql.com <>2006-05-06 11:18:42 +0400
committerkroki@mysql.com <>2006-05-06 11:18:42 +0400
commit0acef25de8c0f1e80040cff215e09ad47b330f7b (patch)
treea9773b7324caaaa0cbf35e9ad1757b17f865cfb5 /Docs
parent8eb1dd26ad7afcb861c030eaf85b8c1dfe16a8b8 (diff)
parentd87e1323797f19aadc13ceb5ed68f3b33a18e2eb (diff)
downloadmariadb-git-0acef25de8c0f1e80040cff215e09ad47b330f7b.tar.gz
Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-merge
Diffstat (limited to 'Docs')
-rwxr-xr-xDocs/changelog-4.0.xml18
-rwxr-xr-xDocs/changelog-4.1.xml18
2 files changed, 0 insertions, 36 deletions
diff --git a/Docs/changelog-4.0.xml b/Docs/changelog-4.0.xml
deleted file mode 100755
index f0f9aa881f1..00000000000
--- a/Docs/changelog-4.0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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>
diff --git a/Docs/changelog-4.1.xml b/Docs/changelog-4.1.xml
deleted file mode 100755
index 644f2940d0f..00000000000
--- a/Docs/changelog-4.1.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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-1-x">
-
- <title>
- Changes in release 4.1.x
- </title>
-
- <para>
- This is a dummy changelog file. Don't use it yet.
- </para>
-
-</appendix>