summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2011-10-26 13:48:49 -0700
committerJohn Stultz <john.stultz@linaro.org>2011-10-26 13:48:49 -0700
commit2216773fc021964a413409141d439de4f6a108f7 (patch)
tree7b2f8cdcdf5fb05d75bd92f0c8d9ac635ceec48c /Makefile
parent42ac8ca89aef66618e8ae2d6e48e3f523bfcd69d (diff)
parentaf1bdb79ca64ceadc7b44b11929b384eff66ce59 (diff)
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebaselinux-linaro-3.1-2011.10-2-android-0
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 2652089bf54..07bc92544e9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 1
SUBLEVEL = 0
-EXTRAVERSION = -rc10
+EXTRAVERSION =
NAME = "Divemaster Edition"
# *DOCUMENTATION*