aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2014-12-01 11:15:54 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2014-12-01 11:16:42 +0100
commitfe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb (patch)
treefd6edbe93b19b167b105897e3de6a7c11eac4f9c /Makefile
parent9a5434fbfc98a0c427c880b167b8ca3499b44e87 (diff)
parent9b47f40bb29d9be34afabfb423bab0ad45cbc11f (diff)
downloadbuildroot-fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb.tar.gz
buildroot-fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb.tar.bz2
Merge branch 'next'
Conflicts: Makefile package/flac/0001-fix-altivec-logic.patch package/grantlee/Config.in Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e554a30960..ad018c88f1 100644
--- a/Makefile
+++ b/Makefile
@@ -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