[mj: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/mj

[Göran Uddeborg]

commit c2159f5b2d76228c889af0edde434fc3b09c498a
Merge: e8be2f2 34bd2c0
Author: Göran Uddeborg <goeran at uddeborg.se>
Date:   Sat Dec 24 23:14:29 2011 +0100

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

 mj.spec |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --cc mj.spec
index b57bd40,8a55f02..9395d79
--- a/mj.spec
+++ b/mj.spec
@@@ -131,11 -130,15 +131,20 @@@ gtk-update-icon-cache %icontop &>/dev/n
  
  
  %changelog
 +* Sat Dec 24 2011 Göran Uddeborg <goeran at uddeborg.se> 1.11-1
 +- Upgrade to new upstreams version.
 +- Do a "make depend"; as distributed, the dependencies points to
 +  /usr/lib, but this should be /usr/lib64 where appropriate.
 +
+ * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 1.10-9
+ - Rebuild for new libpng
+ 
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10-8
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
+ * Wed Sep 29 2010 jkeating - 1.10-7
+ - Rebuilt for gcc bug 634757
+ 
  * Mon Sep 13 2010 Göran Uddeborg <goeran at uddeborg.se> 1.10-6
  - The desktop file called the executable "mj", not "xmj". BZ 633115