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/php/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/php/Makefile') diff --git a/package/php/Makefile b/package/php/Makefile index ee29ed9a3..ea7b20b00 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= php PKG_VERSION:= 5.5.12 PKG_RELEASE:= 1 PKG_MD5SUM:= 3fb091987063135fd86b3b5ba5010479 -PKG_DESCR:= PHP language interpreter -PKG_SECTION:= lang +PKG_DESCR:= php language interpreter +PKG_SECTION:= dev/lang PKG_DEPENDS:= libpthread librt PHP_URL:= http://www.php.net/ PKG_SITES:= http://de.php.net/distributions/ -- cgit v1.2.3