summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-10-14 09:36:17 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2011-10-14 09:36:17 +0200
commit7d5aee0467985313800ac683398f3f77399369d1 (patch)
treef0f0c910dc65614ffbfefa199cbc88c83db4b9b6 /Makefile
parenta5257e9cdebff526b0eb6e133106e7fcfd01f485 (diff)
parent00928230056867bfd1914a29aed81c145fa26e37 (diff)
downloadbarebox-7d5aee0467985313800ac683398f3f77399369d1.tar.gz
barebox-7d5aee0467985313800ac683398f3f77399369d1.tar.xz
Merge branch 'master' into next
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f3ea67b1e6..5d57d1c724 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
VERSION = 2011
-PATCHLEVEL = 08
+PATCHLEVEL = 10
SUBLEVEL = 0
EXTRAVERSION =
NAME = Amissive Actinocutious Kiwi