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-fbdev/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/xf86-video-fbdev') diff --git a/package/xf86-video-fbdev/Makefile b/package/xf86-video-fbdev/Makefile index 358c5c774..b254440e1 100644 --- a/package/xf86-video-fbdev/Makefile +++ b/package/xf86-video-fbdev/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= xf86-video-fbdev PKG_VERSION:= 0.4.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 2b5e6dd218243cf96c1a4090596a6bba -PKG_DESCR:= x11 driver for Linux Framebuffer devices +PKG_DESCR:= x11 driver for framebuffer devices PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server libstdcxx PKG_BUILDDEP:= xorg-server -- cgit v1.2.3