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/make/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/make/Makefile') diff --git a/package/make/Makefile b/package/make/Makefile index e09be88f4..05ffa32a3 100644 --- a/package/make/Makefile +++ b/package/make/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= make PKG_VERSION:= 3.81 PKG_RELEASE:= 1 PKG_MD5SUM:= a4e9494ac6dc3f6b0c5ff75c5d52abba -PKG_DESCR:= GNU make -PKG_SECTION:= lang +PKG_DESCR:= c/c++ code buildtool +PKG_SECTION:= dev/tools PKG_URL:= http://www.gnu.org/software/make PKG_SITES:= ${MASTER_SITE_GNU:=make/} -- cgit v1.2.3