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/jamvm/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/jamvm') diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile index ff87be323..4dade8a8f 100644 --- a/package/jamvm/Makefile +++ b/package/jamvm/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= jamvm PKG_VERSION:= 1.5.4 PKG_RELEASE:= 5 PKG_MD5SUM:= 7654e9657691f5f09c4f481ed4686176 -PKG_DESCR:= Java Virtual Machine (JVM) implementation -PKG_SECTION:= lang +PKG_DESCR:= java virtual machine implementation +PKG_SECTION:= dev/lang PKG_DEPENDS:= libffi zlib PKG_BUILDDEP:= libffi zlib PKG_URL:= http://jamvm.sourceforge.net -- cgit v1.2.3