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/libXext/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libXext') diff --git a/package/libXext/Makefile b/package/libXext/Makefile index 0bd2997d9..640f7ed50 100644 --- a/package/libXext/Makefile +++ b/package/libXext/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libXext PKG_VERSION:= 1.3.1 PKG_RELEASE:= 2 PKG_MD5SUM:= 249478eae5c4fab7722894cb99565405 -PKG_DESCR:= X client interface to extensions of the X protocol +PKG_DESCR:= client interface to extensions of the x protocol PKG_SECTION:= x11/libs PKG_BUILDDEP:= libX11 xextproto libXext-host PKG_SITES:= ${MASTER_SITE_XORG} -- cgit v1.2.3