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/x11vnc | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/x11vnc')
| -rw-r--r-- | package/x11vnc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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/ |