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/fluxbox/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/fluxbox/Makefile') diff --git a/package/fluxbox/Makefile b/package/fluxbox/Makefile index 80dbfc858..887bc6792 100644 --- a/package/fluxbox/Makefile +++ b/package/fluxbox/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= fluxbox PKG_VERSION:= 1.3.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 52e76de0ae96d8c5e87374661d0c7112 -PKG_DESCR:= X11 window manager featuring tabs and an iconbar +PKG_DESCR:= window manager featuring tabs and an iconbar PKG_SECTION:= x11/apps PKG_DEPENDS:= libstdcxx PKG_BUILDDEP:= libXpm libXft -- cgit v1.2.3