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/xf86-video-ati/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/xf86-video-ati') diff --git a/package/xf86-video-ati/Makefile b/package/xf86-video-ati/Makefile index ee08e453b..e1cf24505 100644 --- a/package/xf86-video-ati/Makefile +++ b/package/xf86-video-ati/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= xf86-video-ati PKG_VERSION:= 6.14.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 6bb71cff9ad9c5c7b258b2b6c56fdc95 -PKG_DESCR:= x11 driver for ATI VGA chip +PKG_DESCR:= x11 driver for ati vga chip PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server libdrm mesalib libudev libstdcxx PKG_BUILDDEP:= xorg-server libdrm xf86driproto MesaLib eudev -- cgit v1.2.3