Erick Tryzelaar 561a373d19 Merge branch 'v0.6.x' ... # Conflicts: # serde/src/de/mod.rs # serde_codegen/src/attr.rs # serde_codegen/src/de.rs # serde_codegen/src/lib.rs		2016-02-12 21:43:23 -08:00
..
src	Merge branch 'v0.6.x'	2016-02-12 21:43:23 -08:00
build.rs	Initial support for syntex	2015-05-18 23:34:17 -07:00
Cargo.toml	feat(cargo): Version bump	2016-02-12 21:06:47 -08:00