[libmx/f14/master: 2/2] fix merge issues

[Peter Robinson]

commit e4570b96c9b5ed3736256b7664abac3786afd6d1
Merge: 9cd2945 9e860ff
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Oct 10 14:34:15 2010 +0100

    fix merge issues

 .gitignore |    3 +--
 libmx.spec |    6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 04ac458,eb6d8b5..d8cfe55
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,1 +1,1 @@@
--mx-1.0.3.tar.bz2
- /mx-1.0.4.tar.bz2
++mx-1.0.4.tar.bz2
diff --cc libmx.spec
index ddf00d9,a7b3377..db9a286
--- a/libmx.spec
+++ b/libmx.spec
@@@ -1,6 -1,6 +1,7 @@@
  Name:          libmx
- Version:       1.0.1
 -Version:       1.0.3
 -Release:       2%{?dist}.1
++Version:       1.0.4
 +Release:       1%{?dist}
++
  Summary:       A clutter widget toolkit
  
  Group:         System Environment/Libraries
@@@ -90,9 -91,9 +91,12 @@@ rm -rf %{buildroot
  %{_datadir}/gtk-doc/html/mx
  
  %changelog
 +* Sun Oct 10 2010 Peter Robinson <pbrobinson at gmail.com> 1.0.4-1
 +- New 1.0.4 release
 +
+ * Wed Sep 29 2010 jkeating - 1.0.3-2.1
+ - Rebuilt for gcc bug 634757
+ 
  * Thu Jul 15 2010 Colin Walters <walters at verbum.org> - 1.0.3-2
  - Rebuild with new gobject-introspection