summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <paul@polar.kitebird.com>2006-05-04 16:18:34 -0500
committerunknown <paul@polar.kitebird.com>2006-05-04 16:18:34 -0500
commite38edaefed4a74c6b21fc92c98468016a6090631 (patch)
tree49b982c482f7b6c80f6d0cbf60e47da7c0af4124
parentd1bd5eeb4717f7e586a773a04b3a322395556d35 (diff)
parentac5eb33a42daf27e259624b115b39b9cf45c6e5f (diff)
downloadmariadb-git-e38edaefed4a74c6b21fc92c98468016a6090631.tar.gz
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
-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>