diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-04-21 15:23:17 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-04-21 15:23:17 -0700 |
| commit | cfbc5bebaedc3eb0898eec00ef9dcf8005ab9161 (patch) | |
| tree | 02e0f0c71a243713ca8bdf8ccf2a2230303b05c7 | |
| parent | 0feaf6154c8228451bd965cc1674e12451d2ef27 (diff) | |
| parent | 5c70ff09dad77bb538d031293a95ac3cb4823577 (diff) | |
| download | rust-cfbc5bebaedc3eb0898eec00ef9dcf8005ab9161.tar.gz rust-cfbc5bebaedc3eb0898eec00ef9dcf8005ab9161.zip | |
rollup merge of #24670: brson/1.1
We're not going to do another merge into beta, so what's on master is now destined for 1.1. Also reset the prerelease number to ".1"
| -rw-r--r-- | mk/main.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/main.mk b/mk/main.mk index c5b2fc8b953..d25f9832142 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -13,12 +13,12 @@ ###################################################################### # The version number -CFG_RELEASE_NUM=1.0.0 +CFG_RELEASE_NUM=1.1.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=.3 +CFG_PRERELEASE_VERSION=.1 CFG_FILENAME_EXTRA=4e7c5e5c |