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/rdesktop/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/rdesktop/Makefile') diff --git a/package/rdesktop/Makefile b/package/rdesktop/Makefile index 0c2c5e6c7..b629a2178 100644 --- a/package/rdesktop/Makefile +++ b/package/rdesktop/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= rdesktop PKG_VERSION:= 1.8.1 PKG_RELEASE:= 1 PKG_MD5SUM:= f5382c5c85b0d2cc88b9b1aa9bbf1356 -PKG_DESCR:= client for Windows Terminal Services -PKG_SECTION:= net +PKG_DESCR:= client for windows terminal services +PKG_SECTION:= x11/apps PKG_DEPENDS:= libsamplerate libopenssl alsa-lib libao PKG_BUILDDEP:= libiconv-tiny openssl libsamplerate alsa-lib libao PKG_URL:= http://www.rdesktop.org/ -- cgit v1.2.3