[qxmpp-dev/f18: 9/9] Merge branch 'f17' into f18

[Minh Ngo]

commit 4e0d65a91f5b1aa1be520152dfc99e8095156417
Merge: 963ec57 7235507
Author: Minh Ngo <nlminhtl at gmail.com>
Date:   Sun Aug 12 09:17:34 2012 +0300

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

 .gitignore                 |    5 +++++
 qxmpp-dev-dynamiclib.patch |   36 ++++++++++++------------------------
 qxmpp-dev-htmldoc.patch    |   10 +++++-----
 qxmpp-dev-rename.patch     |   35 ++++++++++++++++++++++-------------
 qxmpp-dev.spec             |   16 ++++++++++------
 sources                    |    6 +-----
 6 files changed, 55 insertions(+), 53 deletions(-)
---
diff --cc qxmpp-dev.spec
index 476d4f4,e05d906..6fe67f7
--- a/qxmpp-dev.spec
+++ b/qxmpp-dev.spec
@@@ -72,9 -72,10 +72,13 @@@ make %{?_smp_mflags
  %{_libdir}/pkgconfig/%{name}.pc
   
  %changelog
+ * Sat Aug 11 2012 Minh Ngo <nlminhtl at gmail.com> 0.6.3.1-1
+ - Updating to the new version
+ - Changelog https://raw.github.com/0xd34df00d/qxmpp-dev/master/CHANGELOG
+ 
 +* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 +
  * Thu Apr 26 2012 Minh Ngo <nlminhtl at gmail.com> 0.3.61-1
  - XEP 0033
  
@@@ -85,9 -83,15 +89,9 @@@
  - Synchronization with upstream
  - updating patches
  
- * 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
 -
  * 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