Merge branch 'master' into license-updates

Signed-off-by: Ian Leonard <antonlacon@gmail.com>

Conflicts:
	devel/patch/Makefile
	multimedia/minidlna/Makefile
This commit is contained in:
Ian Leonard
2014-08-10 01:09:06 -07:00
161 changed files with 100377 additions and 2751 deletions

View File

@@ -11,9 +11,9 @@ PKG_NAME:=patch
PKG_VERSION:=2.7.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/patch
PKG_MD5SUM:=95dd8d7e41dcbcecdd5cd88ef915378d
PKG_MD5SUM:=e9ae5393426d3ad783a300a338c09b72
PKG_LICENSE:=GPL-3.0+
PKG_LICENSE_FILES:=COPYING