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/reaim/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/reaim') diff --git a/package/reaim/Makefile b/package/reaim/Makefile index 959a29686..90508d6eb 100644 --- a/package/reaim/Makefile +++ b/package/reaim/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= reaim PKG_VERSION:= 0.8 PKG_RELEASE:= 9 PKG_MD5SUM:= 647d2ab72ec454f89294accfb3182c09 -PKG_DESCR:= A transparent AIM / MSN proxy -PKG_SECTION:= chat +PKG_DESCR:= transparent aim / msn proxy +PKG_SECTION:= app/chat PKG_DEPENDS:= iptables PKG_URL:= http://reaim.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=reaim/} -- cgit v1.2.3