From e3d32c9e2dfc36c20936e1e51eda8de09e7d69cc Mon Sep 17 00:00:00 2001
From: "paul@kite-hub.kitebird.com" <>
Date: Tue, 8 Mar 2005 10:43:44 -0600
Subject: [PATCH] Add dummy changelog file. It should merge upward without
 conflict.

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

diff --git a/Docs/changelog-4.0.xml b/Docs/changelog-4.0.xml
new file mode 100755
index 00000000000..fc33b3fdb5e
--- /dev/null
+++ b/Docs/changelog-4.0.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book 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>