[metacity/f14/master: 1/3] 2.30.3

[Matthias Clasen]

commit 1f7d5a4b1ed03e9a62aba088b16e89a27921089b
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Thu Sep 30 08:07:14 2010 -0400

    2.30.3
    
    Conflicts:
    
    	.gitignore
    	metacity.spec
    	sources

 .gitignore    |    5 +++++
 metacity.spec |   13 +++++++++++--
 sources       |    4 ++++
 3 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8f6dfbc..86cc468 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
 metacity-2.30.0.tar.bz2
+<<<<<<< HEAD
+=======
+/metacity-2.30.2.tar.bz2
+/metacity-2.30.3.tar.bz2
+>>>>>>> 028565e... 2.30.3
diff --git a/metacity.spec b/metacity.spec
index c625042..e595a7c 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -2,8 +2,8 @@
 
 Summary: Unobtrusive window manager
 Name: metacity
-Version: 2.30.0
-Release: 7%{?dist}
+Version: 2.30.3
+Release: 1%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.30/metacity-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
@@ -243,6 +243,15 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Thu Sep 30 2010 Matthias Clasen <mclasen at redhat.com> - 2.30.3-1
+- Uupdate to 2.30.3
+
+* Wed Sep 29 2010 Matthias Clasen <mclasen at redhat.com> - 2.30.2-1
+- Update to 2.30.2
+
+* Wed Sep 15 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.30.0-8
+- firstboot -> metacity dep (#605675)
+
 * Tue Jul 20 2010 Dan Horák <dan[at]danny.cz> - 2.30.0-7
 - updated the nofocuswindows_prefs patch for gcc 4.5
 
diff --git a/sources b/sources
index 7bb1422..3b9ba69 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
+<<<<<<< HEAD
 7c8a4c8f3b667efcc60f286adb445d4c  metacity-2.30.0.tar.bz2
+=======
+553784f376d96b902e19ff437cd5b339  metacity-2.30.3.tar.bz2
+>>>>>>> 028565e... 2.30.3