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/libXi/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libXi') diff --git a/package/libXi/Makefile b/package/libXi/Makefile index c53095a8c..8b2e62727 100644 --- a/package/libXi/Makefile +++ b/package/libXi/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libXi PKG_VERSION:= 1.6.1 PKG_RELEASE:= 2 PKG_MD5SUM:= d024a9de73191628f9772893f02054d8 -PKG_DESCR:= client interface to the XINPUT extension +PKG_DESCR:= client interface to the xinput extension PKG_SECTION:= x11/libs PKG_BUILDDEP:= xproto xextproto libXext libXi-host PKG_URL:= http://xorg.freedesktop.org/ -- cgit v1.2.3