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/libXcursor/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libXcursor') diff --git a/package/libXcursor/Makefile b/package/libXcursor/Makefile index 1edce97f3..80214222e 100644 --- a/package/libXcursor/Makefile +++ b/package/libXcursor/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libXcursor PKG_VERSION:= 1.1.13 PKG_RELEASE:= 2 PKG_MD5SUM:= 38a6c7ce393cb5bc10e67de087f9d582 -PKG_DESCR:= xcursor library +PKG_DESCR:= cursor library PKG_SECTION:= x11/libs PKG_SITES:= ${MASTER_SITE_XORG} PKG_BUILDDEP:= libXfixes libXrender -- cgit v1.2.3