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/xsetroot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/xsetroot') diff --git a/package/xsetroot/Makefile b/package/xsetroot/Makefile index a1abceb34..0856274b0 100644 --- a/package/xsetroot/Makefile +++ b/package/xsetroot/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 5097ed5bbe1c621ee12950019f71de02 PKG_DESCR:= set root window -PKG_SECTION:= x11/apps +PKG_SECTION:= x11/utils PKG_DEPENDS:= xbitmaps libx11 libxmu libxcursor PKG_BUILDDEP:= xbitmaps libXcursor libXmu PKG_SITES:= ${MASTER_SITE_XORG} -- cgit v1.2.3