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/scons/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/scons') diff --git a/package/scons/Makefile b/package/scons/Makefile index 8eab3c6fb..74ff9c87b 100644 --- a/package/scons/Makefile +++ b/package/scons/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= scons PKG_VERSION:= 2.3.0 PKG_RELEASE:= 2 PKG_MD5SUM:= 083ce5624d6adcbdaf2526623f456ca9 -PKG_DESCR:= a software construction tool -PKG_SECTION:= lang +PKG_DESCR:= software construction tool +PKG_SECTION:= dev/tools HOST_BUILDDEP:= python2-host PKG_URL:= http://www.scons.org PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=scons/} -- cgit v1.2.3