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

[Germán A. Racca]

commit 1a8519e2dc81fccce4cc69a5797e8e8ba7664162
Merge: 9dfc275 92c7fea
Author: Germán A. Racca <skytux at fedoraproject.org>
Date:   Tue Feb 11 18:18:38 2014 -0200

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

 jwm.spec |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
---
diff --cc jwm.spec
index 0e32ef2,692058d..b024683
--- a/jwm.spec
+++ b/jwm.spec
@@@ -61,14 -69,18 +61,26 @@@ install -p -m 644 %{SOURCE1} %{buildroo
  %{_mandir}/man1/%{name}.*
  
  %changelog
 +* Mon Feb 10 2014 Germán A. Racca <skytux at fedoraproject.org> - 2.2.0-1
 +- Updated to new upstream version 2.2.0
 +- Cleaned spec file
 +- Changed tarball format (from bz2 to xz)
 +- Recreated patches jwm-nostrip and jwm-timestamps
 +- Dropped patch jwm-destdir
 +- Added translations
 +
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-6
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
+ * Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 2.1.0-4
+ - rebuild due to "jpeg8-ABI" feature drop
+ 
+ * Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 2.1.0-3
+ - rebuild against new libjpeg
+ 
  * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild