Nick Cameron 0a62a05c67 Merge branch 'syntax' of https://github.com/aochagavia/rust into mulit-decor ...

Conflicts:
	src/librustc/plugin/registry.rs
	src/libsyntax/ext/base.rs
	src/libsyntax/ext/cfg_attr.rs
	src/libsyntax/ext/deriving/mod.rs
	src/libsyntax/ext/expand.rs
	src/libsyntax/print/pprust.rs
	src/test/auxiliary/macro_crate_test.rs

2015-04-25 14:04:46 +12:00

..

pp.rs

syntax: Replace String::from_str with the stable String::from

2015-04-21 10:08:27 -07:00

pprust.rs

Merge branch 'syntax' of https://github.com/aochagavia/rust into mulit-decor

2015-04-25 14:04:46 +12:00