[rkward/f15: 11/11] Merge branch 'f15' of ssh://pkgs.fedoraproject.org/rkward into f15

[Pierre-YvesChibon]

commit 0c1e3f891ddc7e9b79a803f27f2398e46ea3f7af
Merge: 70c28e7 a0f4dcf
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Tue Oct 25 10:11:23 2011 +0200

    Merge branch 'f15' of ssh://pkgs.fedoraproject.org/rkward into f15
    
    Conflicts:
    	rkward.spec

 rkward.spec |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
---
diff --cc rkward.spec
index 6b184ea,67414c9..fe8696d
--- a/rkward.spec
+++ b/rkward.spec
@@@ -1,8 -1,8 +1,16 @@@
++<<<<<<< HEAD
 +%global  Rversion 2.13.2
 +
 +Name:           rkward
 +Version:        0.5.7
 +Release:        1%{?dist}
++=======
+ %global  Rversion 2.13.1
+ 
+ Name:           rkward
+ Version:        0.5.6
+ Release:        2%{?dist}
++>>>>>>> a0f4dcf5799ab3fdcbf2bbd14be0184454025386
  Summary:        Graphical frontend for R language
  Summary(fr):    Interface graphique pour le langage R 
  
@@@ -100,13 -109,7 +108,17 @@@ gtk-update-icon-cache %{_datadir}/icons
  %{_kde4_appsdir}/katepart/syntax/%{name}.xml
  
  %changelog
++<<<<<<< HEAD
 +* 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
++=======
+ * Tue Jul 12 2011 Tom Callaway <spot at fedoraproject.org> 0.5.6-2
++>>>>>>> a0f4dcf5799ab3fdcbf2bbd14be0184454025386
  - rebuild for R 2.13.1
  
  * Tue Jun 21 2011 Pierre-Yves Chibon <pingou at pingoured.fr> 0.5.6-1