diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
tree | 7617315e619f969c13e79c1f44c2428871719357 /package/libXv | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/libXv')
-rw-r--r-- | package/libXv/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/libXv/Makefile b/package/libXv/Makefile index 0842c6758..25cbd0867 100644 --- a/package/libXv/Makefile +++ b/package/libXv/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libXv PKG_VERSION:= 1.0.7 PKG_RELEASE:= 2 PKG_MD5SUM:= 066145bab1f182476589af0ee9c18152 -PKG_DESCR:= X11 Xvideo extensions library +PKG_DESCR:= xvideo extensions library PKG_SECTION:= x11/libs PKG_BUILDDEP:= libX11 videoproto libXext PKG_SITES:= ${MASTER_SITE_XORG} |