[qtsingleapplication/f21: 5/5] Merge master

[Fabio Alessandro Locati]

commit 97f966d7e8c7df3ceb3527d688cd0a70e64ed7fb
Merge: f5d1170 f24d869
Author: Fabio Alessandro Locati <fabio at locati.cc>
Date:   Wed Dec 31 12:47:07 2014 +0100

    Merge master

 .gitignore                                         |    6 +
 LGPL_EXCEPTION                                     |    2 +
 LICENSE.GPL3                                       |  674 ++++++++++++++++++++
 LICENSE.LGPL                                       |  502 +++++++++++++++
 qtsingleapplication-add-api.patch                  |  213 ------
 ...application-build-qtsinglecoreapplication.patch |   46 +-
 ...ngleapplication-dont-bundle-external-libs.patch |   72 ---
 qtsingleapplication-gcc47.patch                    |   11 -
 ...eapplication-remove-included-qtlockedfile.patch |   62 ++
 qtsingleapplication.spec                           |  120 ++--
 sources                                            |    7 +-
 11 files changed, 1345 insertions(+), 370 deletions(-)
---
diff --cc qtsingleapplication.spec
index 390bd1d,9e79516..4346fd0
--- a/qtsingleapplication.spec
+++ b/qtsingleapplication.spec
@@@ -152,9 -168,13 +168,13 @@@ rm -rf $RPM_BUILD_ROO
  %{_qt4_datadir}/mkspecs/features/qtsinglecoreapplication.prf
  
  %changelog
 -* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.1-12
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 -
 -* Fri Aug 15 2014 Fabio Alessandro Locati <fabiolocati at gmail.com> - 2.6.1-11
++* Wed Dec 31 2014 Fabio Alessandro Locati <fabio at locati.cc> - 2.6.1-12
+ - Update to current repository
+ - Clean patches
+ 
 +* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.1-11
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 +
  * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.1-10
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild