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/xterm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/xterm/Makefile') diff --git a/package/xterm/Makefile b/package/xterm/Makefile index 6575fae60..eb9128293 100644 --- a/package/xterm/Makefile +++ b/package/xterm/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= xterm PKG_VERSION:= 303 PKG_RELEASE:= 1 PKG_MD5SUM:= 48f6d49b2b6b6933d501d767cbed9254 -PKG_DESCR:= Terminal Emulator for X Windows +PKG_DESCR:= terminal emulator PKG_SECTION:= x11/apps PKG_DEPENDS:= libxaw libxt libncurses libxft fontconfig PKG_BUILDDEP:= ncurses libXt libXmu libXaw libXft -- cgit v1.2.3