]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #7269 : luqmana/rust/drop, r=thestinger
authorbors <bors@rust-lang.org>
Wed, 26 Jun 2013 03:29:06 +0000 (20:29 -0700)
committerbors <bors@rust-lang.org>
Wed, 26 Jun 2013 03:29:06 +0000 (20:29 -0700)
Finally rename finalize to drop.
Closes #4332.

1  2 
doc/tutorial.md
src/libextra/arc.rs
src/libextra/sync.rs
src/librustc/middle/trans/base.rs
src/librustc/rustc.rs
src/libstd/task/spawn.rs
src/libsyntax/parse/parser.rs

diff --cc doc/tutorial.md
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge