diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-07 23:00:59 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-07 23:00:59 -0300 |
commit | 87bd9124ec1abd5c6171af47af93805b975343b6 (patch) | |
tree | f9732aabf9c46c6391409187f8ddf8cc5b005006 /extra/mediastreamer | |
parent | 96c65d8a0393645808ab5ea31776baa26209fc5f (diff) | |
parent | 0dee03071a0643c3ee5820afa3c694dcef71d385 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/beye/PKGBUILD
community/xmlrpc-c/PKGBUILD
extra/avidemux/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtk2/PKGBUILD
extra/libvpx/PKGBUILD
extra/libxfce4menu/PKGBUILD
extra/libxml2/PKGBUILD
extra/pixman/PKGBUILD
extra/thunar-archive-plugin/PKGBUILD
extra/thunar-volman/PKGBUILD
extra/vdpau-video/PKGBUILD
extra/xfce4-appfinder/PKGBUILD
extra/xfce4-battery-plugin/PKGBUILD
extra/xfce4-cpufreq-plugin/PKGBUILD
extra/xfce4-cpugraph-plugin/PKGBUILD
extra/xfce4-dict/PKGBUILD
extra/xfce4-diskperf-plugin/PKGBUILD
extra/xfce4-eyes-plugin/PKGBUILD
extra/xfce4-fsguard-plugin/PKGBUILD
extra/xfce4-mixer/PKGBUILD
extra/xfce4-mount-plugin/PKGBUILD
extra/xfce4-mpc-plugin/PKGBUILD
extra/xfce4-power-manager/PKGBUILD
extra/xfce4-systemload-plugin/PKGBUILD
extra/xfce4-taskmanager/PKGBUILD
extra/xfce4-time-out-plugin/PKGBUILD
extra/xfce4-timer-plugin/PKGBUILD
extra/xfce4-wavelan-plugin/PKGBUILD
extra/xorg-luit/PKGBUILD
extra/xorg-xfontsel/PKGBUILD
extra/xulrunner/PKGBUILD
kde-unstable/calligra/PKGBUILD
libre/mplayer-vaapi-libre/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'extra/mediastreamer')
-rw-r--r-- | extra/mediastreamer/PKGBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD index 87cb99e44..2648e81e4 100644 --- a/extra/mediastreamer/PKGBUILD +++ b/extra/mediastreamer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145637 2011-12-25 11:01:07Z andrea $ +# $Id: PKGBUILD 149288 2012-02-06 17:33:52Z ibiru $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,7 +6,7 @@ pkgname=mediastreamer pkgver=2.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="A library written in C that allows you to create and run audio and video streams" arch=('i686' 'x86_64' 'mips64el') url="http://www.linphone.org/" |