[qxmpp-dev: 6/6] Merge branch 'f16'

[Minh Ngo]

commit dc781ed5eebc5fface7b547db6f4847441a7bc3d
Merge: 9782e0e 0343c1f
Author: Minh Ngo <nlminhtl at gmail.com>
Date:   Thu Apr 26 21:40:30 2012 +0300

    Merge branch 'f16'
    
    Conflicts:
    	qxmpp-dev.spec
    	sources

 .gitignore                 |    2 ++
 qxmpp-dev-dynamiclib.patch |   10 ++++++----
 qxmpp-dev-htmldoc.patch    |   14 ++++++++++----
 qxmpp-dev-rename.patch     |   23 ++++++++++++-----------
 qxmpp-dev.spec             |   18 ++++++++++++------
 sources                    |    4 ++++
 6 files changed, 46 insertions(+), 25 deletions(-)
---
diff --cc qxmpp-dev.spec
index 079ede5,9b0fc22..239793d
--- a/qxmpp-dev.spec
+++ b/qxmpp-dev.spec
@@@ -73,12 -72,16 +72,19 @@@ 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
+ * Thu Apr 26 2012 Minh Ngo <nlminhtl at gmail.com> 0.3.61-1
+ - XEP 0033
  
 +* 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
 +
+ * Sat Mar 17 2012 Minh Ngo <nlminhtl at gmail.com> 0.3.47-1
+ - Synchronization with upstream
+ - updating patches
+ 
+ * Sun Feb 19 2012 Minh Ngo <nlminhtl at gmail.com> 0.3.45.2-1
+ - Synchronization with upstream
+ 
  * 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
diff --cc sources
index e16081f,07229a2..d123ac3
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +49f714685abfa47c4aeb01b5ea655a0f  qxmpp-0.3.45.2-extras.tar.bz2
++=======
+ 67f16672b65049bc01fc0fad5736067b  qxmpp-0.3.61-extras.tar.bz2
++>>>>>>> f16