Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/6b43fa37 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/6b43fa37 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/6b43fa37 Branch: refs/heads/master Commit: 6b43fa37958c944d918f51794e77ef3b69abf55f Parents: f7be519 97cc95b Author: Henrique Mendonça <[email protected]> Authored: Fri Sep 20 13:24:02 2013 +0200 Committer: Henrique Mendonça <[email protected]> Committed: Fri Sep 20 13:24:02 2013 +0200 ---------------------------------------------------------------------- lib/csharp/src/Protocol/TJSONProtocol.cs | 2 +- test/DocTest.thrift | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
