[qxmpp-dev/f17: 3/4] Merge branch 'f16' into f17

[Minh Ngo]

commit 8d226abbed40a224303238195816d953f3662f2f
Merge: f2ceb39 3e0929a
Author: Minh Ngo <nlminhtl at gmail.com>
Date:   Wed Mar 14 20:29:54 2012 +0200

    Merge branch 'f16' into f17
    
    Conflicts:
    	qxmpp-dev.spec

 .gitignore             |    1 +
 qxmpp-dev-rename.patch |   16 ++++++++--------
 qxmpp-dev.spec         |    7 +++++--
 sources                |    2 +-
 4 files changed, 15 insertions(+), 11 deletions(-)
---
diff --cc qxmpp-dev.spec
index 24b6199,e8c3688..079ede5
--- 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
+ - Synchronization with upstream
+ 
 +* 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
 +
  * Mon Jan 08 2012 Minh Ngo <nlminhtl at gmail.com> 0.3.45.1-4
  - fixing summary/description in the devel package
  - adding a dependence for the devel package