Merge branch 'next'

Conflicts:
	Makefile
	package/flac/0001-fix-altivec-logic.patch
	package/grantlee/Config.in

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2014-12-01 11:15:54 +01:00
182 changed files with 1452 additions and 953 deletions

View File

@@ -28,7 +28,7 @@
all:
# Set and export the version string
export BR2_VERSION := 2014.11
export BR2_VERSION := 2015.02-git
# Check for minimal make version (note: this check will break at make 10.x)
MIN_MAKE_VERSION = 3.81