diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-25 10:25:19 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-25 10:25:19 +0100 |
| commit | d8eb584da3a24a7b4cccf1b4b39b19ca8fc19495 (patch) | |
| tree | 8e5ea3b068852a348646a0543fdacbd7de7a937e /community/gmerlin | |
| parent | 82e1a8e4caf3318dbb60adda8c2649ae7ac15661 (diff) | |
| parent | 299e917c17619f800f0c21cf43209065b608223f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/pigeonhole/PKGBUILD
community/mingw32-pthreads/PKGBUILD
community/openbsd-netcat/PKGBUILD
community/remmina/PKGBUILD
core/crda/PKGBUILD
core/libnl/PKGBUILD
core/wpa_supplicant/PKGBUILD
extra/fontconfig/PKGBUILD
extra/gnome-python-extras/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gvfs/PKGBUILD
extra/libcdio/PKGBUILD
extra/maxima/PKGBUILD
extra/vcdimager/PKGBUILD
extra/vlc/PKGBUILD
extra/xfdesktop/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/q4wine/PKGBUILD
testing/dovecot/PKGBUILD
Diffstat (limited to 'community/gmerlin')
| -rw-r--r-- | community/gmerlin/PKGBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD index ec7381c28..9cdd89b5a 100644 --- a/community/gmerlin/PKGBUILD +++ b/community/gmerlin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 63592 2012-02-05 11:58:41Z ibiru $ +# $Id: PKGBUILD 66294 2012-02-23 13:44:07Z allan $ # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=gmerlin pkgver=1.0.0 -pkgrel=5 +pkgrel=6 pkgdesc="Multimedia architecture for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://openmovieeditor.sourceforge.net/HomePage" |