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/libXinerama/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libXinerama/Makefile') diff --git a/package/libXinerama/Makefile b/package/libXinerama/Makefile index f1e2597b9..cfa4637d6 100644 --- a/package/libXinerama/Makefile +++ b/package/libXinerama/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libXinerama PKG_VERSION:= 1.1.2 PKG_RELEASE:= 2 PKG_MD5SUM:= 29a813b3850d499a3524a8d5d5ecb099 -PKG_DESCR:= Xinerama library +PKG_DESCR:= xinerama library PKG_SECTION:= x11/libs PKG_BUILDDEP:= xineramaproto libXinerama-host HOST_BUILDDEP:= xineramaproto-host libXext-host -- cgit v1.2.3