From fee5916b60c605ff5086d8fdc2a85c5ea21351f6 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Sat, 31 Jan 2009 19:03:12 +0000
Subject: Merge revisions 37108:37199 from trunk.

svn path=/branches/kill-bonobo/; revision=37200
---
 plugins/external-editor/ChangeLog | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'plugins/external-editor/ChangeLog')

diff --git a/plugins/external-editor/ChangeLog b/plugins/external-editor/ChangeLog
index 694cd53c64..3bf30a612f 100644
--- a/plugins/external-editor/ChangeLog
+++ b/plugins/external-editor/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-28  Tor Lillqvist  <tml@novell.com>
+
+	Windows port by Fridrich Strba.
+
+	* Makefile.am: Use -no-undefined and link with more libraries on
+	Windows.
+
+	* external-editor.c: Check HAVE_SYS_WAIT_H.
+
 2008-08-27  Sankar P  <psankar@novell.com>
 
 License Changes
-- 
cgit v1.2.3