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/xrdb/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/xrdb') diff --git a/package/xrdb/Makefile b/package/xrdb/Makefile index 286a6f858..3ac0f1615 100644 --- a/package/xrdb/Makefile +++ b/package/xrdb/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= xrdb PKG_VERSION:= 1.0.7 PKG_RELEASE:= 1 PKG_MD5SUM:= 146c009e7abc52b611db4cac4883488e -PKG_DESCR:= X resource database management tools -PKG_SECTION:= x11/apps +PKG_DESCR:= resource database management tools +PKG_SECTION:= x11/utils PKG_DEPENDS:= libx11 libxmu PKG_BUILDDEP:= libX11 libXmu PKG_SITES:= ${MASTER_SITE_XORG} -- cgit v1.2.3