From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 29 May 2014 11:40:49 +0200
Subject: resolve merge conflict

---
 package/libglew/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/libglew/Makefile')

diff --git a/package/libglew/Makefile b/package/libglew/Makefile
index 8fd346821..380a318e6 100644
--- a/package/libglew/Makefile
+++ b/package/libglew/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:=		libglew
 PKG_VERSION:=		1.10.0
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		2f09e5e6cb1b9f3611bcac79bc9c2d5d
-PKG_DESCR:=		OpenGL Extension Wrangler Library (GLEW)
-PKG_SECTION:=		libs
+PKG_DESCR:=		opengl extension wrangler library
+PKG_SECTION:=		libs/video
 PKG_DEPENDS:=		libx11 libxmu libxi libxext
 PKG_BUILDDEP:=		libX11 libXmu libXi libXext
 PKG_URL:=		http://glew.sourceforge.net/index.html
-- 
cgit v1.2.3