]> git.lizzy.rs Git - rust.git/commit
rollup merge of #24670: brson/1.1
authorAlex Crichton <alex@alexcrichton.com>
Tue, 21 Apr 2015 22:23:17 +0000 (15:23 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Tue, 21 Apr 2015 22:23:17 +0000 (15:23 -0700)
commitcfbc5bebaedc3eb0898eec00ef9dcf8005ab9161
tree02e0f0c71a243713ca8bdf8ccf2a2230303b05c7
parent0feaf6154c8228451bd965cc1674e12451d2ef27
parent5c70ff09dad77bb538d031293a95ac3cb4823577
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"