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/libXrandr/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libXrandr') diff --git a/package/libXrandr/Makefile b/package/libXrandr/Makefile index 11bff2efb..42868233d 100644 --- a/package/libXrandr/Makefile +++ b/package/libXrandr/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libXrandr PKG_VERSION:= 1.3.2 PKG_RELEASE:= 2 PKG_MD5SUM:= edacf83655be2e48348b626c0dc454f3 -PKG_DESCR:= Xrandr library +PKG_DESCR:= xrandr library PKG_SECTION:= x11/libs PKG_BUILDDEP:= randrproto PKG_SITES:= ${MASTER_SITE_XORG} -- cgit v1.2.3