aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | style/naming fixJisi Liu2015-10-151-9/+11
| * | | make cc_out and py_out internal.Jisi Liu2015-10-141-3/+3
| * | | Format code.Jisi Liu2015-10-141-34/+34
| * | | buildifier the fileJisi Liu2015-10-141-11/+14
| * | | Extract protoc action into .bzl for cc.Jisi Liu2015-10-142-25/+131
|/ / /
* | | Merge pull request #824 from jtattermusch/expose_get_output_fileJan Tattermusch2015-10-144-39/+58
|\ \ \
| * | | expose GetOutputFile in csharp_names.hJan Tattermusch2015-09-234-39/+58
* | | | Merge pull request #875 from tkarls/return_correct_bool_type_from_mapFeng Xiao2015-10-131-1/+1
|\ \ \ \
| * | | | Changed return type from int32 to bool in function returning a boolThomas Karlsson2015-10-131-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #878 from matthewvalimaki/autogen-optionsFeng Xiao2015-10-131-1/+13
|\ \ \ \
| * | | | Add support for arguments.Matthew Valimaki2015-10-131-1/+13
| |/ / /
* | | | Merge pull request #876 from tkarls/use_correct_int_type_in_set_functionFeng Xiao2015-10-131-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Changed argument typ to uint32 in set function that sets an uint32 valueThomas Karlsson2015-10-131-1/+1
|/ / /
* | | Merge pull request #815 from TeBoring/third-partyPaul Yang2015-10-0915-348/+37
|\ \ \
| * | | Down-integrate internal bug fixing changes.Bo Yang2015-10-0415-348/+37
* | | | Merge pull request #822 from podsvirov/topic-cmake-readmeFeng Xiao2015-10-091-76/+272
|\ \ \ \
| * | | | Update cmake/README.md for #783 PRKonstantin Podsvirov2015-10-091-76/+272
|/ / / /
* | | | Merge pull request #866 from Sahloul/patch-1Feng Xiao2015-10-081-1/+1
|\ \ \ \
| * | | | Use static castHamdi Sahloul2015-10-091-1/+1
| * | | | VS2010 compatibility of address initalizationHamdi Sahloul2015-10-091-1/+1
* | | | | Merge pull request #856 from mzhaom/bazel-buildJisi Liu2015-10-081-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add missing csharp_doc_comment.cc to protoc_lib.Ming Zhao2015-10-071-0/+1
|/ / / /
* | | | Merge pull request #846 from jskeet/tostringJon Skeet2015-10-075-115/+203
|\ \ \ \
| * | | | Support ToString in RepeatedField and MapField.Jon Skeet2015-10-015-115/+203
* | | | | Merge pull request #860 from pherl/masterJisi Liu2015-10-071-8/+10
|\ \ \ \ \
| * | | | | add complete WKT for python.Jisi Liu2015-10-061-4/+8
| * | | | | Generate well known types for python.Jisi Liu2015-10-061-8/+6
|/ / / / /
* | | | | Merge pull request #849 from pherl/masterJisi Liu2015-10-06107-878/+3322
|\ \ \ \ \
| * | | | | Remove duplicated header fileJisi Liu2015-10-061-218/+0
| * | | | | Revert unwanted changes.Jisi Liu2015-10-062-35/+35
| * | | | | remove extra collection importJisi Liu2015-10-061-1/+0
| * | | | | disable tests for python-cpp under py26 as well.Jisi Liu2015-10-062-3/+4
| * | | | | disable py2.6 tests for json_format_testJisi Liu2015-10-052-2/+4
| * | | | | Revert back changes to import unittest2 for py26Jisi Liu2015-10-0516-26/+64
| * | | | | make the python json test less strict on expected errors.Jisi Liu2015-10-051-5/+5
| * | | | | fix stringpiece test to use portable hash set.Jisi Liu2015-10-051-1/+1
| * | | | | Adding back three missing export macros.Jisi Liu2015-10-051-3/+3
| * | | | | Merge remote-tracking branch 'origin/master' into fix-authorJisi Liu2015-10-0586-2090/+4997
| |\ \ \ \ \
| * | | | | | Down-integrate from google internal.Jisi Liu2015-10-05112-962/+3562
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #837 from mzhaom/bazel-javaJisi Liu2015-10-051-1/+22
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add "java_proto" target in bazel BUILD file to provide Java runtimeMing Zhao2015-09-291-1/+22
* | | | | | Merge pull request #845 from jskeet/xmldocsJan Tattermusch2015-10-0532-1/+2123
|\ \ \ \ \ \
| * | | | | | Generated code from previous commit.Jon Skeet2015-10-0119-0/+1945
| * | | | | | First pass at generating XML documentation from .proto comments.Jon Skeet2015-10-0113-1/+178
* | | | | | | Merge pull request #843 from thomasvl/objcpp_enum_fwd_declPaul Yang2015-10-015-6/+92
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Support enum forward decls in Objective C++Thomas Van Lenten2015-10-015-6/+92
|/ / / / / /
* | | | | | Merge pull request #841 from thomasvl/newer_xcodesPaul Yang2015-09-3015-1208/+1216
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Cleanups for newer XcodesThomas Van Lenten2015-09-2915-1208/+1216
| |/ / / /
* | | | | Merge pull request #834 from jskeet/docfixesJon Skeet2015-09-3023-5/+75
|\ \ \ \ \
| * | | | | Fix typo in oneof case enum commentJon Skeet2015-09-306-10/+10