summaryrefslogtreecommitdiff
path: root/core/bash
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-07-23 18:13:37 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-07-23 18:13:37 +0200
commitcc565b7309a5708f2375b5f6926d173fd122119d (patch)
treec1d4adcda7f0b767537620aea02633158e17218a /core/bash
parentc25ed1401d3fa3dd6827c33bc11b660dcd425f23 (diff)
parenta65eb6fe2ea0ffa22c65de34506c88aeeb3c88ee (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/electricsheep/PKGBUILD community/bitcoin/PKGBUILD community/gnash/PKGBUILD community/mongodb/PKGBUILD community/xmlrpc-c/PKGBUILD community/xmoto/PKGBUILD core/kbd/PKGBUILD extra/elfutils/PKGBUILD extra/gtk2/PKGBUILD extra/hddtemp/PKGBUILD extra/libpst/PKGBUILD extra/mkvtoolnix/PKGBUILD extra/php-apc/PKGBUILD extra/pulseaudio/PKGBUILD extra/pyqt/PKGBUILD extra/quota-tools/PKGBUILD extra/rhythmbox/PKGBUILD extra/virtuoso/PKGBUILD extra/vlc/PKGBUILD extra/xf86-video-siliconmotion/PKGBUILD kde-unstable/soprano/PKGBUILD libre/epdfview-libre/PKGBUILD libre/pacman/PKGBUILD multilib/lib32-libpulse/PKGBUILD multilib/wine/PKGBUILD multilib/zsnes/PKGBUILD testing/bash/PKGBUILD testing/bison/PKGBUILD testing/dbus-core/PKGBUILD testing/dbus/PKGBUILD testing/readline/PKGBUILD testing/systemd/PKGBUILD
Diffstat (limited to 'core/bash')
-rw-r--r--core/bash/PKGBUILD8
1 files changed, 5 insertions, 3 deletions
diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD
index 35bba67a7..567b7c9a9 100644
--- a/core/bash/PKGBUILD
+++ b/core/bash/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163494 2012-07-13 12:31:26Z allan $
+# $Id: PKGBUILD 163854 2012-07-21 11:22:49Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=bash
_basever=4.2
-_patchlevel=036 #prepare for some patches
+_patchlevel=037 #prepare for some patches
pkgver=$_basever.$_patchlevel
pkgrel=1
pkgdesc="The GNU Bourne Again shell"
@@ -151,4 +151,6 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
'7cd9bfdf7cbfd45274d07620ee94c8d9'
'a7d2eace0da5fd236c93dbfd93458838'
'9c3142956064d175a880bcb186e51ef9'
- 'a1a87649853f20fe99572ddc02b0c67f')
+ 'a1a87649853f20fe99572ddc02b0c67f'
+ 'c10692f447d4966c879f8fb8d7c8ebc9'
+ '1bf5e34ad46566bc2d0eb7560ff8968e')