[arch-commits] Commit in r/repos (extra-i686 extra-i686/PKGBUILD)

[Ronald van Haren]

    Date: Wednesday, October 22, 2008 @ 14:44:57
  Author: ronald
Revision: 16871

fix svn merge conflict

Modified:
  r/repos/extra-i686/	(properties)
  r/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Property changes on: r/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /r/trunk:1-1257
   + /r/trunk:1-16870

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-10-22 18:37:08 UTC (rev 16870)
+++ extra-i686/PKGBUILD	2008-10-22 18:44:57 UTC (rev 16871)
@@ -4,7 +4,7 @@
 # Contributor: K. Piche <kpiche at rogers.com>
 
 pkgname=r
-pkgver=2.7.2
+pkgver=2.8.0
 pkgrel=1
 pkgdesc="R is a language and environment for statistical computing and graphics"
 arch=("i686" "x86_64")
@@ -15,7 +15,7 @@
 source=(http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz
 	r.desktop
 	r.png)
-md5sums=('6122945e9301825b97a506151b3cefde'
+md5sums=('5213c9644aec984278b669df1a63a2ce'
          'f6d54d32e510d90c748a0d16d2abcbdc'
          '00659f39e90627fe87f1645df5d4e3a7')