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
+2
View File
@@ -16,7 +16,9 @@ PKG_SOURCE_URL:=@SF/minidlna
PKG_MD5SUM:=879027192c89e5376cdd2ae2d1aa33b4
PKG_LICENSE:=GPL-2.0 BSD-3-Clause
PKG_LICENSE_FILES:=COPYING LICENCE.miniupnpd
PKG_MAINTAINER:=Knyazkov Dmitry <medavedik@gmail.com>
PKG_BUILD_PARALLEL:=0
PKG_BUILD_DEPENDS:=util-linux