diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-01 10:41:09 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-01 10:41:09 +0200 |
commit | aa100084bd4ba3ebc3f452ad2cc1acbf8f253a17 (patch) | |
tree | b7f1124277c02cace71cad2b6290dd010796df07 /extra/r | |
parent | 22a099ec0cc8532196da82ff11d6fb2b3b34fea8 (diff) | |
parent | 939efb693a8b362edc0c6ccba62c5ce54fb501af (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/sqlite3/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/atk/PKGBUILD
gnome-unstable/baobab/PKGBUILD
gnome-unstable/brasero/PKGBUILD
gnome-unstable/cheese/PKGBUILD
gnome-unstable/devhelp/PKGBUILD
gnome-unstable/eog-plugins/PKGBUILD
gnome-unstable/eog/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/evolution/PKGBUILD
gnome-unstable/folks/PKGBUILD
gnome-unstable/gcalctool/PKGBUILD
gnome-unstable/gdl/PKGBUILD
gnome-unstable/gdm/PKGBUILD
gnome-unstable/gedit/PKGBUILD
gnome-unstable/gjs/PKGBUILD
gnome-unstable/glade/PKGBUILD
gnome-unstable/glib-networking/PKGBUILD
gnome-unstable/glibmm/PKGBUILD
gnome-unstable/gnome-bluetooth/PKGBUILD
gnome-unstable/gnome-color-manager/PKGBUILD
gnome-unstable/gnome-contacts/PKGBUILD
gnome-unstable/gnome-control-center/PKGBUILD
gnome-unstable/gnome-documents/PKGBUILD
gnome-unstable/gnome-games/PKGBUILD
gnome-unstable/gnome-games/gnome-games.install
gnome-unstable/gnome-online-accounts/PKGBUILD
gnome-unstable/gnome-screensaver/PKGBUILD
gnome-unstable/gnome-search-tool/PKGBUILD
gnome-unstable/gnome-session/PKGBUILD
gnome-unstable/gnome-settings-daemon/PKGBUILD
gnome-unstable/gnome-shell/PKGBUILD
gnome-unstable/gnome-system-monitor/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
gnome-unstable/gtkmm3/PKGBUILD
gnome-unstable/gtksourceview3/PKGBUILD
gnome-unstable/libpeas/PKGBUILD
gnome-unstable/libsoup/PKGBUILD
gnome-unstable/libwebkit/PKGBUILD
gnome-unstable/mutter/PKGBUILD
gnome-unstable/nautilus/PKGBUILD
gnome-unstable/pango/PKGBUILD
gnome-unstable/sushi/PKGBUILD
gnome-unstable/totem-plparser/PKGBUILD
gnome-unstable/totem/PKGBUILD
gnome-unstable/vala/PKGBUILD
gnome-unstable/vinagre/PKGBUILD
gnome-unstable/vino/PKGBUILD
gnome-unstable/yelp/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/wine/PKGBUILD
testing/libarchive/PKGBUILD
testing/openssl/PKGBUILD
testing/util-linux/PKGBUILD
Diffstat (limited to 'extra/r')
-rw-r--r-- | extra/r/PKGBUILD | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD index 742d7801a..5e0733772 100644 --- a/extra/r/PKGBUILD +++ b/extra/r/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153726 2012-03-18 19:57:52Z ronald $ +# $Id: PKGBUILD 154825 2012-03-30 19:44:16Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: K. Piche <kpiche@rogers.com> pkgname=r -pkgver=2.14.2 +pkgver=2.15.0 pkgrel=1 pkgdesc="Language and environment for statistical computing and graphics" arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz" 'r.desktop' 'r.png') install=r.install -sha1sums=('523dca7694e4d0c8701fcc783ea3767e46fe7a62' +sha1sums=('a633f87fdbd22e8c371971c535ca815e63c297f6' '13aa29219bcaa102e575de8c1c8e0833d233e836' 'a69a07ec363440efc18ce0a7f2af103375dea978') |