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

@@ -17,6 +17,7 @@ PKG_MD5SUM:=43bd6676f0b404326eee2d63be3cdcfe
PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_LICENSE:=GPL-3.0
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1