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/libXpm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libXpm') diff --git a/package/libXpm/Makefile b/package/libXpm/Makefile index 9d47e2446..a32e76795 100644 --- a/package/libXpm/Makefile +++ b/package/libXpm/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libXpm PKG_VERSION:= 3.5.10 PKG_RELEASE:= 2 PKG_MD5SUM:= a70507638d74541bf30a771f1e5938bb -PKG_DESCR:= common operation for the XPM pixmap format +PKG_DESCR:= common operation for the xpm pixmap format PKG_BUILDDEP:= libX11 libXt PKG_SECTION:= x11/libs PKG_SITES:= ${MASTER_SITE_XORG} -- cgit v1.2.3