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/libXrender/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libXrender') diff --git a/package/libXrender/Makefile b/package/libXrender/Makefile index d19fcab51..8bbbf8677 100644 --- a/package/libXrender/Makefile +++ b/package/libXrender/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libXrender PKG_VERSION:= 0.9.7 PKG_RELEASE:= 2 PKG_MD5SUM:= b6702e6f56f9d9103dc688f4336529a9 -PKG_DESCR:= X11 rendering library +PKG_DESCR:= x11 rendering library PKG_SECTION:= x11/libs PKG_BUILDDEP:= renderproto-host xproto-host xextproto-host libXau-host PKG_BUILDDEP+= xcb-proto-host libpthread-stubs-host libxcb-host kbproto-host -- cgit v1.2.3