]> git.lizzy.rs Git - rust.git/commit
rollup merge of #19972: alexcrichton/snapshots
authorAlex Crichton <alex@alexcrichton.com>
Sun, 21 Dec 2014 08:07:29 +0000 (00:07 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Sun, 21 Dec 2014 17:28:07 +0000 (09:28 -0800)
commitdbeef0edb2d25a3ff321d8e09532f053b5ef2c07
tree9ac43217e9134d908926c2aa7bfda279582f1ee6
parentb084cda4e9e0540b67d5db728b58acf8afba9f6e
parent84086c464f537591f0e4629676b3fc75517492ab
rollup merge of #19972: alexcrichton/snapshots

Conflicts:
src/libcollections/string.rs
src/libcollections/vec.rs
src/snapshots.txt
src/libcollections/btree/set.rs
src/libcollections/enum_set.rs
src/libcollections/string.rs
src/libcollections/vec.rs
src/libcore/ops.rs
src/librustc/middle/ty.rs
src/libstd/bitflags.rs
src/libstd/time/duration.rs
src/libsyntax/codemap.rs
src/libtime/lib.rs