Erick Tryzelaar 42b8b6153e Merge branch 'v0.6.x' into master ... # Conflicts: # serde/Cargo.toml # serde/src/ser/impls.rs # serde_codegen/src/attr.rs # serde_codegen/src/de.rs # serde_codegen/src/field.rs # serde_codegen/src/ser.rs		2016-01-18 12:45:39 -08:00
..
bench_enum.rs	Merge branch 'v0.6.x' into master	2016-01-18 12:45:39 -08:00
bench_map.rs	Merge pull request #162 from skade/std-error	2015-12-08 14:10:45 -05:00
bench_struct.rs	Merge branch 'v0.6.x' into master	2016-01-18 12:45:39 -08:00
bench_vec.rs	Merge pull request #162 from skade/std-error	2015-12-08 14:10:45 -05:00
bench.rs	feat(clippy): Use clippy for it's extra lints	2016-01-18 12:24:03 -08:00
bench.rs.in	Migrate serde_json into it's own repo	2015-08-29 18:09:51 -07:00