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/xinit/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/xinit') diff --git a/package/xinit/Makefile b/package/xinit/Makefile index 8106806c0..6990defd4 100644 --- a/package/xinit/Makefile +++ b/package/xinit/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.1 PKG_RELEASE:= 5 PKG_MD5SUM:= 7ad82221ebd6600a8d33712ec3b62efb PKG_DESCR:= x window system initializer -PKG_SECTION:= x11/apps +PKG_SECTION:= x11/utils PKG_DEPENDS:= xorg-server mcookie xauth xset xterm libstdcxx PKG_BUILDDEP:= xorg-server PKG_URL:= http://xorg.freedesktop.org/ -- cgit v1.2.3