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/damageproto/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/damageproto') diff --git a/package/damageproto/Makefile b/package/damageproto/Makefile index 5dec9b7de..17a5f170c 100644 --- a/package/damageproto/Makefile +++ b/package/damageproto/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= damageproto PKG_VERSION:= 1.2.1 PKG_RELEASE:= 1 PKG_MD5SUM:= bf8c47b7f48625230cff155180f8ddce -PKG_DESCR:= X DAMAGE Extension headers -PKG_SECTION:= devel +PKG_DESCR:= x damage extension headers +PKG_SECTION:= dev/header PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev devonly -- cgit v1.2.3