]> git.lizzy.rs Git - rust.git/commitdiff
projects / rust.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f1f9066 d61d7b5)
Merge branch 'master' of github.com:paulstansifer/rust
authorPaul Stansifer <paul.stansifer@gmail.com>
Thu, 26 Jul 2012 23:16:12 +0000 (16:16 -0700)
committerPaul Stansifer <paul.stansifer@gmail.com>
Thu, 26 Jul 2012 23:16:12 +0000 (16:16 -0700)
Conflicts:
mk/docs.mk
src/libsyntax/ext/base.rs


Trivial merge
Empowering everyone to build reliable and efficient software.