[libmx/f17: 2/2] fix merge

[Peter Robinson]

commit d9212749406537882ac576175cf0554837282138
Merge: 5bf77d6 fa1eda0
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Mar 10 10:14:55 2012 +0000

    fix merge

 libmx.spec |    7 +++++--
 sources    |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc libmx.spec
index 6ed8895,c888a8a..89f0475
--- a/libmx.spec
+++ b/libmx.spec
@@@ -90,9 -90,9 +90,12 @@@ find %{buildroot} -name '*.la' -exec r
  %{_datadir}/gtk-doc/html/mx-gtk
  
  %changelog
+ * Sat Mar 10 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.4.3-1
+ - Release 1.4.3
+ 
 +* Sun Feb 26 2012 Matthias Clasen <mclasen at redhat.com> - 1.4.1-5
 +- Rebuild against new cogl
 +
  * Thu Jan 19 2012 Matthias Clasen <mclasen at redhat.com> - 1.4.1-4
  - Rebuild against new cogl