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/xorg-server/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/xorg-server') diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 6ddb22793..40865e491 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.15.1 PKG_RELEASE:= 1 PKG_MD5SUM:= d6e5444fc33ad737b551cc49061ae704 PKG_DESCR:= xorg server -PKG_SECTION:= x11/server +PKG_SECTION:= x11/drivers PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile PKG_DEPENDS+= libfontenc xkeyboard-config xkbcomp libxau libxaw PKG_DEPENDS+= libxmu libxpm libxrender libxt libxxf86dga libxext -- cgit v1.2.3