about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-05-16 03:48:24 +0000
committerbors <bors@rust-lang.org>2015-05-16 03:48:24 +0000
commite10bd27f50cc37618fd364d50b5ef0bcffdd46d8 (patch)
tree7bdd02d6c772285eb50c319184803b31cb4a674c
parent4ce08a5d70a4dfc4da7ed0bc0098cfd2176b8411 (diff)
parent6149e32b0ba41b39d6d81b7f5d28908c86debf18 (diff)
downloadrust-e10bd27f50cc37618fd364d50b5ef0bcffdd46d8.tar.gz
rust-e10bd27f50cc37618fd364d50b5ef0bcffdd46d8.zip
Auto merge of #25447 - brson:version, r=alexcrichton
-rw-r--r--mk/main.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/main.mk b/mk/main.mk
index 964153e4494..b3c02841340 100644
--- a/mk/main.mk
+++ b/mk/main.mk
@@ -13,7 +13,7 @@
 ######################################################################
 
 # The version number
-CFG_RELEASE_NUM=1.1.0
+CFG_RELEASE_NUM=1.2.0
 
 # An optional number to put after the label, e.g. '.2' -> '-beta.2'
 # NB Make sure it starts with a dot to conform to semver pre-release