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/vnc-reflector/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/vnc-reflector') diff --git a/package/vnc-reflector/Makefile b/package/vnc-reflector/Makefile index d6c36d88f..30e11bf6d 100644 --- a/package/vnc-reflector/Makefile +++ b/package/vnc-reflector/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= vnc-reflector PKG_VERSION:= 1.2.4 PKG_RELEASE:= 2 PKG_MD5SUM:= c3f88bc62f228b335c25c07f9744ab0c -PKG_DESCR:= specialized VNC server which acts as a proxy -PKG_SECTION:= proxy +PKG_DESCR:= specialized vnc server which acts as a proxy +PKG_SECTION:= net/proxy PKG_DEPENDS:= libjpeg-turbo zlib PKG_BUILDDEP:= libjpeg-turbo zlib PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vnc-reflector/} -- cgit v1.2.3