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/gcc/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'package/gcc')

diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index b0d3194e8..1b8104658 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -5,14 +5,14 @@ include ${TOPDIR}/rules.mk
 include ${TOPDIR}/toolchain/gcc/Makefile.inc
 
 PKG_NAME:=		gcc
-PKG_DESCR:=		GNU C compiler
-PKG_SECTION:=		lang
+PKG_DESCR:=		c compiler
+PKG_SECTION:=		dev/lang
 PKG_OPTS:=		noremove
 PKG_DEPENDS:=		libmpc libgmp mpfr
 PKG_BUILDDEP:=		libmpc gmp mpfr
 
 PKG_SUBPKGS:=		GCC GXX
-PKGSD_GXX:=		GNU C++ compiler
+PKGSD_GXX:=		c++ compiler
 
 WRKBUILD=               ${WRKDIR}/${PKG_NAME}-obj
 
-- 
cgit v1.2.3