]> git.lizzy.rs Git - rust.git/commitdiff
Merge branch 'master' into mulit-decor
authorNick Cameron <ncameron@mozilla.com>
Wed, 13 May 2015 03:09:17 +0000 (15:09 +1200)
committerNick Cameron <ncameron@mozilla.com>
Wed, 13 May 2015 03:09:17 +0000 (15:09 +1200)
1  2 
src/libsyntax/ext/deriving/generic/mod.rs
src/libsyntax/ext/expand.rs

Simple merge