diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
tree | 7617315e619f969c13e79c1f44c2428871719357 /package/yasm | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/yasm')
-rw-r--r-- | package/yasm/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
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/ |