diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-17 10:46:15 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-17 10:46:15 +0100 |
commit | e30ba9d4c857530c2fbb3cc82236a49676d5ebc9 (patch) | |
tree | 966498ac914356462e691b8e550ab1f1d069074c /extra/opencv | |
parent | 69f67102b7a02871e32a079ffb789d5fca72a746 (diff) | |
parent | c6f4cd18ab706868be0eff10327a0dcd58cecdf3 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cantata/PKGBUILD
community/ffmpeg-compat/PKGBUILD
community/v8/PKGBUILD
core/e2fsprogs/PKGBUILD
core/groff/PKGBUILD
core/openssl/PKGBUILD
extra/avidemux/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/glpk/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/mediastreamer/PKGBUILD
extra/netcdf/PKGBUILD
extra/octave/PKGBUILD
extra/opal/PKGBUILD
extra/sox/PKGBUILD
extra/x264/PKGBUILD
Diffstat (limited to 'extra/opencv')
-rw-r--r-- | extra/opencv/PKGBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 9344dd309..185059c03 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 174304 2013-01-04 05:15:04Z schiv $ +# $Id: PKGBUILD 178140 2013-02-16 22:48:58Z ioni $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ pkgbase=opencv pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV pkgver=2.4.3 -pkgrel=4 +pkgrel=5 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64' 'mips64el') license=('BSD') |