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/fixesproto/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/fixesproto/Makefile') diff --git a/package/fixesproto/Makefile b/package/fixesproto/Makefile index 2048bbefe..cbc568c90 100644 --- a/package/fixesproto/Makefile +++ b/package/fixesproto/Makefile @@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:= fixesproto PKG_VERSION:= 5.0 PKG_RELEASE:= 1 -PKG_DESCR:= XFIXES Extension headers -PKG_SECTION:= devel +PKG_DESCR:= xfixes extension headers +PKG_SECTION:= dev/header PKG_MD5SUM:= 1b3115574cadd4cbea1f197faa7c1de4 PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev devonly -- cgit v1.2.3