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/x11vnc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/x11vnc') diff --git a/package/x11vnc/Makefile b/package/x11vnc/Makefile index b13ce9dfc..0ddc53651 100644 --- a/package/x11vnc/Makefile +++ b/package/x11vnc/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= x11vnc PKG_VERSION:= 0.9.13 PKG_RELEASE:= 1 PKG_MD5SUM:= a372ec4fe8211221547b1c108cf56e4c -PKG_DESCR:= VNC server for X11 displays +PKG_DESCR:= vnc server for x11 displays PKG_SECTION:= x11/apps PKG_BUILDDEP:= libX11 libXtst libjpeg-turbo PKG_URL:= http://www.karlrunge.com/x11vnc/ -- cgit v1.2.3