From cea054cd54d84479352a43bbabc19c9ce9af5efb Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Fri, 8 Aug 2008 04:26:12 +0000
Subject: Merge revisions 35747:35930 from trunk.

svn path=/branches/kill-bonobo/; revision=35931
---
 art/ChangeLog           |   7 +++++++
 art/query-free-busy.png | Bin 1127 -> 0 bytes
 2 files changed, 7 insertions(+)
 delete mode 100644 art/query-free-busy.png

(limited to 'art')

diff --git a/art/ChangeLog b/art/ChangeLog
index 1e853a15ee..71bc919db2 100644
--- a/art/ChangeLog
+++ b/art/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-18  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #542125
+
+	* Makefile.am:
+	Move query-free-busy.png to data/icons.
+
 2007-10-12  Michael Monreal <michael.monreal@gmail.com>
 
          ** Migration of theme icons to data/icons/ (bug #479257)
diff --git a/art/query-free-busy.png b/art/query-free-busy.png
deleted file mode 100644
index 228c4a5b07..0000000000
Binary files a/art/query-free-busy.png and /dev/null differ
-- 
cgit