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/libXfixes/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libXfixes/Makefile') diff --git a/package/libXfixes/Makefile b/package/libXfixes/Makefile index cf6242e17..27327dd07 100644 --- a/package/libXfixes/Makefile +++ b/package/libXfixes/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libXfixes PKG_VERSION:= 5.0 PKG_RELEASE:= 2 PKG_MD5SUM:= 0a2139e91df4758218e0fddbd549e13c -PKG_DESCR:= X Fixes Library +PKG_DESCR:= x11 fixes library PKG_SECTION:= x11/libs PKG_BUILDDEP:= fixesproto xextproto xproto libX11 PKG_URL:= http://xorg.freedesktop.org/ -- cgit v1.2.3