]> git.lizzy.rs Git - rust.git/commitdiff
projects / rust.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a07db4 0a7ef3f)
rollup merge of #20089: rolftimmermans/json-control-chars-escape
authorAlex Crichton <alex@alexcrichton.com>
Mon, 22 Dec 2014 20:54:32 +0000 (12:54 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Mon, 22 Dec 2014 23:17:22 +0000 (15:17 -0800)
Conflicts:
src/libserialize/json.rs

1  2 
src/libserialize/json.rs patch | diff1 | diff2 | blob | history

diff --cc src/libserialize/json.rs
Simple merge
Empowering everyone to build reliable and efficient software.