Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/my/mysql-5.0

Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
047b9e31 · monty@mysql.com · 0034e1c8 · 61632812 · 0034e1c8
Commit 047b9e31 authored May 05, 2006 by monty@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 18 deletions

Docs/changelog-5.0.xml Docs/changelog-5.0.xml +0 -18

No files found.
--- a/Docs/changelog-5.0.xml
+++ b/Docs/changelog-5.0.xml
-<?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-5.0-x">
-
- <title>
-  Changes in release 5.0.x
- </title>
-
- <para>
-  This is a dummy changelog file. Don't use it yet.
- </para>
-
-</appendix>