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/libXdamage/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libXdamage') diff --git a/package/libXdamage/Makefile b/package/libXdamage/Makefile index 0fa0b2e4d..6e5218d75 100644 --- a/package/libXdamage/Makefile +++ b/package/libXdamage/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libXdamage PKG_VERSION:= 1.1.3 PKG_RELEASE:= 2 PKG_MD5SUM:= 5e54789fd1c56392d38d29c6b8dad142 -PKG_DESCR:= X Window System client interface to the DAMAGE extension to the X protocol +PKG_DESCR:= client interface to the damage extension PKG_SECTION:= x11/libs PKG_BUILDDEP:= libXfixes damageproto PKG_SITES:= ${MASTER_SITE_XORG} -- cgit v1.2.3