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/libXmu/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libXmu') diff --git a/package/libXmu/Makefile b/package/libXmu/Makefile index 28c1772cc..11ff12b92 100644 --- a/package/libXmu/Makefile +++ b/package/libXmu/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libXmu PKG_VERSION:= 1.1.1 PKG_RELEASE:= 2 PKG_MD5SUM:= 53fd02bc7174dd643a26bcc88147c146 -PKG_DESCR:= miscellaneous utility functions for X libraries +PKG_DESCR:= miscellaneous utility functions for x libraries PKG_SECTION:= x11/libs PKG_BUILDDEP:= libXt libXext PKG_SITES:= ${MASTER_SITE_XORG} -- cgit v1.2.3