[quitcount: 5/5] Merge branch 'master' of ssh://pkgs.fedoraproject.org/quitcount

[Fabian Affolter]

commit 7826d75c1d102ae7f8b79654add4f26fe42e96fc
Merge: 51b7ad0 96bcb4a
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Tue Jun 24 08:52:58 2014 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/quitcount
    
    Conflicts:
    	quitcount.spec

 quitcount.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc quitcount.spec
index 096ba62,d52a79d..003d346
--- a/quitcount.spec
+++ b/quitcount.spec
@@@ -52,12 -54,11 +52,15 @@@ gtk-update-icon-cache %{_datadir}/icons
  %{_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
 +
+ * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Sat May 24 2014 Richard Hughes <richard at hughsie.com> - 3.1.1-1
  - New upstream release