From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/libXv/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libXv') 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} -- cgit v1.2.3