]> git.lizzy.rs Git - rust.git/commitdiff
rollup merge of #21760: brson/snaps
authorAlex Crichton <alex@alexcrichton.com>
Fri, 30 Jan 2015 20:06:41 +0000 (12:06 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Fri, 30 Jan 2015 21:26:42 +0000 (13:26 -0800)
1  2 
src/libcore/ops.rs
src/libcore/str/mod.rs

Simple merge
Simple merge