From 50985b6783d544c6eeae9066fd6e2e1526547412 Mon Sep 17 00:00:00 2001
From: unknown <paul@kite-hub.kitebird.com>
Date: Tue, 8 Mar 2005 13:15:36 -0600
Subject: [PATCH] changelog-5.0.xml:   Add dummy changelog file. It should
 merge upward without conflict.

---
 Docs/changelog-5.0.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100755 Docs/changelog-5.0.xml

diff --git a/Docs/changelog-5.0.xml b/Docs/changelog-5.0.xml
new file mode 100755
index 00000000000..deb059716ad
--- /dev/null
+++ b/Docs/changelog-5.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-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>