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/f57ec91e Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/f57ec91e Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/f57ec91e Branch: refs/heads/master Commit: f57ec91e53b914c674812131bb261411b8b85c2b Parents: da7982e 0049ec7 Author: Henrique Mendonça <[email protected]> Authored: Fri May 31 23:54:56 2013 +0200 Committer: Henrique Mendonça <[email protected]> Committed: Sat Jun 1 11:31:51 2013 +0200 ---------------------------------------------------------------------- .gitignore | 1 + Makefile.am | 8 ++++++-- compiler/cpp/src/generate/t_js_generator.cc | 3 ++- debian/docs | 1 - 4 files changed, 9 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
