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/nasm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/nasm') diff --git a/package/nasm/Makefile b/package/nasm/Makefile index 494766f58..d2d53910b 100644 --- a/package/nasm/Makefile +++ b/package/nasm/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 2.11.02 PKG_RELEASE:= 1 PKG_MD5SUM:= ec43582b8febae24e5b440ae816120c8 PKG_DESCR:= assembler application -PKG_SECTION:= lang +PKG_SECTION:= dev/lang PKG_BUILDDEP:= nasm-host PKG_URL:= http://sourceforge.net/projects/nasm/ PKG_SITES:= http://www.nasm.us/pub/nasm/releasebuilds/${PKG_VERSION}/ -- cgit v1.2.3