Auto merge of #24287 - brson:beta, r=steveklabnik

r? @steveklabnik

Should land this, https://github.com/rust-lang/rust/pull/24270, and https://github.com/rust-lang/rust/pull/24245 before rolling another beta.
This commit is contained in:
bors 2015-04-14 04:42:06 +00:00
commit 5dc8060e3f

View File

@ -18,7 +18,7 @@ CFG_RELEASE_NUM=1.0.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
# versions (section 9)
CFG_PRERELEASE_VERSION=
CFG_PRERELEASE_VERSION=.2
CFG_FILENAME_EXTRA=4e7c5e5c