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/libX11/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libX11') diff --git a/package/libX11/Makefile b/package/libX11/Makefile index bc6c45336..3b6334da3 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libX11 PKG_VERSION:= 1.6.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 7e17129e1678355d8268883ee31a6edf -PKG_DESCR:= X11 client-side library +PKG_DESCR:= x11 client-side library PKG_SECTION:= x11/libs PKG_BUILDDEP:= xproto-host xextproto-host libXau-host libpthread-stubs-host PKG_BUILDDEP+= xcb-proto-host libxcb-host kbproto-host -- cgit v1.2.3