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/xvinfo/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/xvinfo') diff --git a/package/xvinfo/Makefile b/package/xvinfo/Makefile index 8b3fe1fc9..10c379009 100644 --- a/package/xvinfo/Makefile +++ b/package/xvinfo/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= xvinfo PKG_VERSION:= 1.1.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 49f5a19ddff9393aaea4ecaacaedddb3 -PKG_DESCR:= print out X-Video extension adaptor information -PKG_SECTION:= x11/apps +PKG_DESCR:= print out x-video extension adaptor information +PKG_SECTION:= x11/utils PKG_BUILDDEP:= libXv PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= ${MASTER_SITE_XORG} -- cgit v1.2.3