about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-04-21 15:23:17 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-04-21 15:23:17 -0700
commitcfbc5bebaedc3eb0898eec00ef9dcf8005ab9161 (patch)
tree02e0f0c71a243713ca8bdf8ccf2a2230303b05c7 /src/liballoc
parent0feaf6154c8228451bd965cc1674e12451d2ef27 (diff)
parent5c70ff09dad77bb538d031293a95ac3cb4823577 (diff)
downloadrust-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"
Diffstat (limited to 'src/liballoc')
0 files changed, 0 insertions, 0 deletions