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/inputproto/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/inputproto') diff --git a/package/inputproto/Makefile b/package/inputproto/Makefile index 19945f02c..5d53f6604 100644 --- a/package/inputproto/Makefile +++ b/package/inputproto/Makefile @@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:= inputproto PKG_VERSION:= 2.3 PKG_RELEASE:= 1 -PKG_DESCR:= X Input Extension headers -PKG_SECTION:= devel +PKG_DESCR:= input extension headers +PKG_SECTION:= dev/header PKG_BUILDDEP:= inputproto-host PKG_MD5SUM:= 5ea366d32a9a78d6204a47ea35d9dc5c PKG_SITES:= ${MASTER_SITE_XORG} -- cgit v1.2.3