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/libXaw/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libXaw') diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile index be7b78d41..80e68aa29 100644 --- a/package/libXaw/Makefile +++ b/package/libXaw/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libXaw PKG_VERSION:= 1.0.11 PKG_RELEASE:= 2 PKG_MD5SUM:= c487a810a8a9b0eb5091f382790b4e75 -PKG_DESCR:= X11 Athena Widget library +PKG_DESCR:= athena widget library PKG_SECTION:= x11/libs PKG_BUILDDEP:= libXext libXmu libXpm PKG_SITES:= ${MASTER_SITE_XORG} -- cgit v1.2.3