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/xkeyboard-config/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/xkeyboard-config') diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile index df46bc896..eec77493a 100644 --- a/package/xkeyboard-config/Makefile +++ b/package/xkeyboard-config/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= xkeyboard-config PKG_VERSION:= 2.11 PKG_RELEASE:= 1 PKG_MD5SUM:= e3defd29cc464cc1a1dfa0eebaca53b1 -PKG_DESCR:= X keyboard config -PKG_SECTION:= x11/libs +PKG_DESCR:= keyboard config +PKG_SECTION:= x11/misc PKG_BUILDDEP:= autotool util-macros xkbcomp PKG_SITES:= http://www.x.org/releases/individual/data/xkeyboard-config/ -- cgit v1.2.3