[quitcount: 4/5] Merge branch 'f20'

[Fabian Affolter]

commit 51b7ad05eabfa6eb4380aabf61544c7709ac7f5e
Merge: 6da7d98 46ff9fd
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Tue Jun 24 08:50:45 2014 +0200

    Merge branch 'f20'
    
    Conflicts:
    	.gitignore
    	quitcount.spec
    	sources

 .gitignore     |    4 ++++
 quitcount.spec |   28 +++++++++++++++-------------
 sources        |    4 ++++
 3 files changed, 23 insertions(+), 13 deletions(-)
---
diff --cc .gitignore
index 0e920ea,8ccbb2d..c1e84fb
--- a/.gitignore
+++ b/.gitignore
@@@ -2,3 -2,4 +2,7 @@@ quitcount-1.7.tar.g
  /quitcount-1.8.tar.gz
  /quitcount-2.0.tar.gz
  /quitcount-3.1.1.tar.gz
++<<<<<<< HEAD
++=======
+ /quitcount-3.1.3.tar.gz
++>>>>>>> f20
diff --cc quitcount.spec
index 875c67e,db31765..096ba62
--- a/quitcount.spec
+++ b/quitcount.spec
@@@ -51,13 -49,16 +49,17 @@@ gtk-update-icon-cache %{_datadir}/icons
  %doc AUTHORS ChangeLog COPYING README
  %{_bindir}/%{name}
  %{_sysconfdir}/xdg/autostart/%{name}.desktop
 +%{_datadir}/appdata/%{name}.appdata.xml
  %{_datadir}/applications/%{name}.desktop
  %{_datadir}/icons/hicolor/scalable/apps/*.svg
+ %{_datadir}/appdata/%{name}.appdata.xml
  
  %changelog
+ * Tue Jun 24 2014 Fabian Affolter <mail at fabian-affolter.ch> - 3.1.3-1
+ - Update to latest upstream release 3.1.3
+ 
 -* Sat May 24 2014 Fabian Affolter <mail at fabian-affolter.ch> - 3.1.1-1
 -- Update to latest upstream release 3.1.1
 +* Sat May 24 2014 Richard Hughes <richard at hughsie.com> - 3.1.1-1
 +- New upstream release
  
  * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-5
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --cc sources
index 56b9780,c35affa..99b2fd3
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +1adae33558544e8272507305d386948a  quitcount-3.1.1.tar.gz
++=======
+ bc17020e6fc15a91f77ad3e9f5528763  quitcount-3.1.3.tar.gz
++>>>>>>> f20