summaryrefslogtreecommitdiff
path: root/package/fluxbox
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-29 09:40:49 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-29 19:56:31 (GMT)
commitf14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch)
tree7617315e619f969c13e79c1f44c2428871719357 /package/fluxbox
parent365261c9db442081290b7d21aba6201244af294d (diff)
resolve merge conflict
Diffstat (limited to 'package/fluxbox')
-rw-r--r--package/fluxbox/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/fluxbox/Makefile b/package/fluxbox/Makefile
index 80dbfc8..887bc67 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