diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-03 10:40:40 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-03 10:40:40 +0100 |
| commit | f104a5865e580d1a5c50f83b6bfac2885f065c92 (patch) | |
| tree | 4c543c5c6394e5beb8e8d0fd53d21ed6227937f6 /extra | |
| parent | e870acdc8dab25660ea941076debf87e6ef6639e (diff) | |
Fix merge.
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/vlc/PKGBUILD | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 5b5fab6f9..f23c9fd41 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -28,7 +28,6 @@ optdepends=('avahi: for service discovery using bonjour protocol' [ "$CARCH" = "mips64el" ] || optdepends+=('lirc-utils: for lirc plugin') optdepends+=('libavc1394: for devices using the 1394ta AV/C' 'libdc1394: for IEEE 1394 plugin' -<<<<<<< HEAD 'kdelibs: KDE Solid hardware integration') [ "$CARCH" = "mips64el" ] || optdepends+=('libva-vdpau-driver: vdpau back-end for nvidia' 'libva-driver-intel: back-end for intel cards') |