[libmx/f17: 3/3] fix merge

[Peter Robinson]

commit e874623167ff28c49c57052e2988314e6561b166
Merge: 2133b4a f73b4c7
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Apr 2 14:57:45 2012 +0100

    fix merge

 libmx.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc libmx.spec
index bdbd9ac,e6b16e0..8c0afb3
--- a/libmx.spec
+++ b/libmx.spec
@@@ -90,12 -90,12 +90,18 @@@ find %{buildroot} -name '*.la' -exec r
  %{_datadir}/gtk-doc/html/mx-gtk
  
  %changelog
 +* Mon Apr  2 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.4.5-1
 +- Release 1.4.5
 +
 +* Wed Mar 14 2012 Brian Pepple <bpepple at fedoraproject.org> - 1.4.3-2
 +- Rebuild for cogl
 +
+ * Wed Mar 21 2012 Karsten Hopp <karsten at redhat.com> 1.4.3-3
+ - rebuild with new cogl (PPC)
+ 
+ * Sat Mar 10 2012 Matthias Clasen <mclasen at redhat.com> - 1.4.3-2
+ - Rebuild against new cogl
+ 
  * Sat Mar 10 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.4.3-1
  - Release 1.4.3