Erick Tryzelaar 6e1e8a75f3 Merge remote-tracking branch 'remotes/origin/master' ...

Conflicts:
	.gitignore

2014-09-07 01:20:51 -07:00

..

json

Updated non_snake_case and struct lifetimes for the latest Rust

2014-09-04 21:57:13 -04:00

de.rs

Updated non_snake_case and struct lifetimes for the latest Rust

2014-09-04 21:57:13 -04:00

lib.rs

Move the benchmarks into a benches/ directory

2014-09-06 20:41:13 -07:00

ser.rs

Updated non_snake_case and struct lifetimes for the latest Rust

2014-09-04 21:57:13 -04:00