[qmmp: 3/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/qmmp

[Karel Volný]

commit a5ae9417bf9e949668d426149e9be853c2bf77b8
Merge: 6165491 959ed6f
Author: Karel Volný <kvolny at redhat.com>
Date:   Mon Jun 9 14:43:26 2014 +0200

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

 qmmp.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc qmmp.spec
index 41d0e24,b38b1ed..4050d17
--- a/qmmp.spec
+++ b/qmmp.spec
@@@ -143,10 -143,9 +143,13 @@@ f
  
  
  %changelog
 +* Mon Jun 09 2014 Karel Volný <kvolny at redhat.com> 0.7.7-1
 +- new version
 +- see the upstream changelog at http://qmmp.ylsoftware.com/
 +
+ * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.4-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Fri Jan 17 2014 Karel Volný <kvolny at redhat.com> 0.7.4-1
  - new version
  - see the upstream changelog at http://qmmp.ylsoftware.com/