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-geode/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/xf86-video-geode/Makefile') diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile index 56b83f4c8..0005f98a4 100644 --- a/package/xf86-video-geode/Makefile +++ b/package/xf86-video-geode/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= xf86-video-geode PKG_VERSION:= 2.11.15 PKG_RELEASE:= 1 PKG_MD5SUM:= a38a23055fcabed87dbd5e7c9e32bc05 -PKG_DESCR:= x11 driver for AMD Geode VGA chip +PKG_DESCR:= x11 driver for amd geode vga chip PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server libstdcxx PKG_BUILDDEP:= xorg-server -- cgit v1.2.3