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/libXcomposite/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libXcomposite') diff --git a/package/libXcomposite/Makefile b/package/libXcomposite/Makefile index ffc71f44b..c3075bb49 100644 --- a/package/libXcomposite/Makefile +++ b/package/libXcomposite/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libXcomposite PKG_VERSION:= 0.4.3 PKG_RELEASE:= 2 PKG_MD5SUM:= b93dac50c86db6eba3f72e949f5bed2a -PKG_DESCR:= X composite library +PKG_DESCR:= composite library PKG_SECTION:= x11/libs PKG_BUILDDEP:= libX11 compositeproto libXfixes PKG_SITES:= ${MASTER_SITE_XORG} -- cgit v1.2.3