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/yasm/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/yasm') diff --git a/package/yasm/Makefile b/package/yasm/Makefile index 1e30f2fde..42e18b732 100644 --- a/package/yasm/Makefile +++ b/package/yasm/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= yasm PKG_VERSION:= 1.2.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 4cfc0686cf5350dd1305c4d905eb55a6 -PKG_DESCR:= modular assembler project -PKG_SECTION:= lang +PKG_DESCR:= modular assembler +PKG_SECTION:= dev/lang PKG_BUILDDEP:= yasm-host PKG_URL:= http://www.tortall.net/projects/yasm/ PKG_SITES:= http://www.tortall.net/projects/yasm/releases/ -- cgit v1.2.3