[qxmpp-dev/f17: 4/4] Merge branch 'f17' of ssh://pkgs.fedoraproject.org/qxmpp-dev into f17

[Minh Ngo]

commit 32550c71b2163b7261a1dded6be68e5e8c22018e
Merge: 8d226ab 8561c48
Author: Minh Ngo <nlminhtl at gmail.com>
Date:   Wed Mar 14 20:31:49 2012 +0200

    Merge branch 'f17' of ssh://pkgs.fedoraproject.org/qxmpp-dev into f17
    
    Conflicts:
    	qxmpp-dev.spec

 qxmpp-dev.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc qxmpp-dev.spec
index 079ede5,1fc946b..39d663f
--- a/qxmpp-dev.spec
+++ b/qxmpp-dev.spec
@@@ -73,9 -73,9 +73,12 @@@ make %{?_smp_mflags
  %{_libdir}/pkgconfig/%{name}.pc
   
  %changelog
- * Sun Feb 19 2012 Minh Ngo <nlminhtl at gmail.com> 0.3.45.2-1
++* Sun Mar 14 2012 Minh Ngo <nlminhtl at gmail.com> 0.3.45.2-1
 +- Synchronization with upstream
 +
+ * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.45.1-6
+ - Rebuilt for c++ ABI breakage
+ 
  * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.45.1-5
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild