[rkward: 2/2] Merge repo

[Pierre-YvesChibon]

commit 62a10afd8cb1d1723c1973c43f9c5a020ec99e9c
Merge: fc309d6 19d8808
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Tue Oct 25 08:55:06 2011 +0200

    Merge repo

 rkward.spec |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)
---
diff --cc rkward.spec
index d9fa91e,a112fdf..83818ad
--- a/rkward.spec
+++ b/rkward.spec
@@@ -1,8 -1,8 +1,8 @@@
- %global  Rversion 2.13.0
+ %global  Rversion 2.13.2
  
  Name:           rkward
 -Version:        0.5.6
 -Release:        3%{?dist}
 +Version:        0.5.7
 +Release:        1%{?dist}
  Summary:        Graphical frontend for R language
  Summary(fr):    Interface graphique pour le langage R 
  
@@@ -109,9 -101,12 +101,15 @@@ gtk-update-icon-cache %{_datadir}/icons
  %{_kde4_appsdir}/katepart/syntax/%{name}.xml
  
  %changelog
 +* Tue Oct 23 2011 Pierre-Yves Chibon <pingou at pingoured.fr> 0.5.7-1
 +- Update to 0.5.7
 +
+ * Fri Oct  7 2011 Tom Callaway <spot at fedoraproject.org> 0.5.6-3
+ - rebuild for R 2.13.2
+ 
+ * Mon Jul 11 2011 Tom Callaway <spot at fedoraproject.org> 0.5.6-2
+ - rebuild for R 2.13.1
+ 
  * Tue Jun 21 2011 Pierre-Yves Chibon <pingou at pingoured.fr> 0.5.6-1
  - Update to 0.5.6