From 2de9f839a0053f64f9a3ab947f5ecb6caa12c43b Mon Sep 17 00:00:00 2001
From: Mathias Hasselmann <hasselmm@src.gnome.org>
Date: Wed, 12 Dec 2007 10:36:08 +0000
Subject: [PATCH] Use proper ChangeLog file for the rev 6098 change.

svn path=/trunk/; revision=6099
---
 ChangeLog         | 8 --------
 gobject/ChangeLog | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 12224d09b..3f0d857f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,3 @@
-2007-11-11  Mathias Hasselmann  <mathias@openismus.com>
-
-	Always exit with non-zero error code when printing warnings.
-
-	* gobject/glib-genmarshal.c: Add global exit_status variable, and use
-	it in pad() and process_signature() to return with non-zero error code
-	when printing warnings. (#495294)
-
 2007-12-11 Rahul Bhalerao <b.rahul.pm@gmail.com>
 
 	* configure.in: Added entry for Marathi Translations
diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 6e6b7fd68..c01a2b9e9 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-11  Mathias Hasselmann  <mathias@openismus.com>
+
+	Always exit with non-zero error code when printing warnings.
+
+	* gobject/glib-genmarshal.c: Add global exit_status variable, and use
+	it in pad() and process_signature() to return with non-zero error code
+	when printing warnings. (#495294)
+
 2007-11-08  Matthias Clasen <mclasen@redhat.com>
 
 	* glib-mkenums.in: Don't shift ARGV[0] to undefined.