[sugar-jukebox: 2/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/sugar-jukebox

[Kalpa Welivitigoda]

commit acdb1c243da06559058ead67b8beb21d7dbcf98d
Merge: 6fbd794 7f1198a
Author: Kalpa Welivitigoda <callkalpa at gmail.com>
Date:   Mon May 27 22:45:14 2013 +0530

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/sugar-jukebox
    
    Conflicts:
    	.gitignore
    	sources
    	sugar-jukebox.spec

 .gitignore         |    6 ++++++
 sources            |    4 ++++
 sugar-jukebox.spec |   29 +++++++++++++++++++++++++++--
 3 files changed, 37 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 243c0f2,278df58..bbe4203
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,6 +1,10 @@@
  Jukebox-19.tar.bz2
  /Jukebox-20.tar.bz2
  /Jukebox-23.tar.bz2
++<<<<<<< HEAD
 +/Jukebox-31.tar.bz2
++=======
+ /Jukebox-28.tar.bz2
+ /Jukebox-29.tar.bz2
+ /Jukebox-30.tar.bz2
++>>>>>>> 7f1198a26a1376ac7c56f4c244bf1950903d4233
diff --cc sources
index 015d8b7,a5c4937..b7d4172
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +4fc51a440a0f06da51040199e063766b  Jukebox-31.tar.bz2
++=======
+ c15ae9d8c5376e27dc25a60917e746ee  Jukebox-30.tar.bz2
++>>>>>>> 7f1198a26a1376ac7c56f4c244bf1950903d4233
diff --cc sugar-jukebox.spec
index 89473e7,4106ed7..745ccee
--- a/sugar-jukebox.spec
+++ b/sugar-jukebox.spec
@@@ -1,5 -1,5 +1,9 @@@
  Name:		sugar-jukebox
++<<<<<<< HEAD
 +Version:	31
++=======
+ Version:	30
++>>>>>>> 7f1198a26a1376ac7c56f4c244bf1950903d4233
  Release:	1%{?dist}
  Summary:	Media player activity for Sugar
  
@@@ -39,8 -43,20 +47,25 @@@ python ./setup.py install --prefix=$RPM
  
  
  %changelog
++<<<<<<< HEAD
 +* Mon May 27 2013 Kalpa Welivitigoda <callkalpa at gmail.com> - 31-1
 +- New 31 release
++=======
+ * Tue Apr  9 2013 Peter Robinson <pbrobinson at fedoraproject.org> 30-1
+ - New 30 release
+ 
+ * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 29-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
+ * Sun Nov  4 2012 Peter Robinson <pbrobinson at fedoraproject.org> 29-1
+ - New 29 release
+ 
+ * Sat Oct 13 2012 Peter Robinson <pbrobinson at fedoraproject.org> 28-1
+ - New 28 release
+ 
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 23-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
++>>>>>>> 7f1198a26a1376ac7c56f4c244bf1950903d4233
  
  * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 23-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild