diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-24 14:50:00 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-24 14:50:00 +0100 |
| commit | 82e1a8e4caf3318dbb60adda8c2649ae7ac15661 (patch) | |
| tree | bc42529997fa58fc26481c8ba7524560f3baa5af /community/python-cjson/PKGBUILD | |
| parent | f87cdf22eb712b5b1c118f768d4ff710fc839403 (diff) | |
| parent | d466ef49f224a9347fe0375eac8126725e10a0a4 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/arpack/PKGBUILD
community/flac123/PKGBUILD
community/flashrom/PKGBUILD
community/liblockfile/PKGBUILD
community/python-cjson/PKGBUILD
community/tcpflow/PKGBUILD
extra/vlc/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
Diffstat (limited to 'community/python-cjson/PKGBUILD')
| -rw-r--r-- | community/python-cjson/PKGBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/community/python-cjson/PKGBUILD b/community/python-cjson/PKGBUILD index 0979021c3..6c92e760c 100644 --- a/community/python-cjson/PKGBUILD +++ b/community/python-cjson/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 26256 2010-09-14 13:39:01Z schuay $ +# $Id: PKGBUILD 66126 2012-02-23 01:35:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Lincoln de Sousa <lincoln@archlinux-br.org> pkgname=python-cjson pkgver=1.0.5 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') pkgdesc="Fast JSON encoder/decoder for Python" |