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/qemu | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/qemu')
-rw-r--r-- | package/qemu/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/qemu/Makefile b/package/qemu/Makefile index c7b486509..6e8f23005 100644 --- a/package/qemu/Makefile +++ b/package/qemu/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.7.1 PKG_RELEASE:= 2 PKG_MD5SUM:= 9541063d999cf9659ed7fdce71314f31 PKG_DESCR:= cpu and system emulator -PKG_SECTION:= misc +PKG_SECTION:= sys/misc PKG_DEPENDS:= zlib glib PKG_BUILDDEP:= gettext-tiny libiconv-tiny PKG_BUILDDEP+= zlib glib |