aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ensure the conformance build of objc code is using the Mac OS X SDK andThomas Van Lenten2015-12-022-2/+8
* Merge pull request #1000 from jskeet/any-formatJon Skeet2015-12-026-525/+894
|\
| * Handle JSON parsing for Any.Jon Skeet2015-12-025-509/+761
| * JSON formatting for Any.Jon Skeet2015-12-022-18/+135
|/
* Merge pull request #1016 from tswast/tutorial-regionsFeng Xiao2015-12-011-3/+17
|\
| * Add region tags for protocol buffers tutorials.Tim Swast2015-12-011-3/+17
|/
* Merge pull request #998 from tswast/goexampleFeng Xiao2015-11-308-0/+410
|\
| * Add a Go language example.Tim Swast2015-11-258-0/+410
* | Merge pull request #1011 from c0nk/wip-implicit-cast-fixFeng Xiao2015-11-302-6/+8
|\ \
| * | Fix some narrowing implicit casts [NFC]Kal Conley2015-11-282-6/+8
|/ /
* | Merge pull request #1007 from dlh3/patch-1Feng Xiao2015-11-251-2/+2
|\ \
| * | Fix typo in LazyField javadocDave Hughes2015-11-241-2/+2
|/ /
* | Merge pull request #1005 from oon3m0oo/emscriptenFeng Xiao2015-11-242-1/+5
|\ \
| * | Adds support for buliding protobuf with emscripten; we just needed the proper...Craig Donner2015-11-242-1/+5
|/ /
* | Merge pull request #1003 from sainaetr/patch-1Thomas Van Lenten2015-11-231-0/+1
|\|
| * Update GPBProtocolBuffers.hOsman Cihangir2015-11-241-0/+1
|/
* Merge pull request #1001 from thomasvl/fix_last_objc_conformance_testsThomas Van Lenten2015-11-232-7/+2
|\
| * Set the stream limit to the length of the data.Thomas Van Lenten2015-11-232-7/+2
|/
* Merge pull request #980 from thomasvl/obj_conformanceThomas Van Lenten2015-11-237-7/+245
|\
| * Add support for the conformance test for objc when run on OS XThomas Van Lenten2015-11-187-7/+245
* | Merge pull request #990 from jskeet/namingJon Skeet2015-11-2229-245/+208
|\ \
| * | Generated code changes for previous commit (basically InternalBuildGeneratedF...Jon Skeet2015-11-2221-22/+22
| * | Tidy up reflection in advance of attempting to implement DynamicMessage.Jon Skeet2015-11-2210-225/+188
|/ /
* | Merge pull request #994 from jskeet/type-registryJon Skeet2015-11-224-0/+279
|\ \
| * | Added the type registry in advance of implementing Any support.Jon Skeet2015-11-214-0/+279
|/ /
* | Merge pull request #988 from gabikliot/CSharp-SampleUsage-Big-FixJan Tattermusch2015-11-191-2/+5
|\ \
| * | Removed redundant comment.Gabriel Kliot2015-11-191-1/+0
| * | Fixed a bug in CSharp SampleUsage.Gabriel Kliot2015-11-181-1/+5
| |/
* | Merge pull request #989 from jskeet/rename-umbrellaJan Tattermusch2015-11-1910-42/+37
|\ \
| * | Rename "umbrella" to "reflection" consistently.Jon Skeet2015-11-1910-42/+37
* | | Merge pull request #977 from lberki/masterJisi Liu2015-11-191-0/+2
|\ \ \ | |/ / |/| |
| * | add headersLukacs T. Berki2015-11-161-0/+2
* | | Merge pull request #974 from jskeet/parserJon Skeet2015-11-1925-122/+244
|\ \ \
| * | | Finished an implementation commentJon Skeet2015-11-191-1/+3
| * | | Generated code from previous commit.Jon Skeet2015-11-1920-105/+107
| * | | Introduce a Parser property into MessageDescriptor, and populate it from gene...Jon Skeet2015-11-195-17/+135
|/ / /
* | | Merge pull request #944 from jskeet/umbrella-classnameJon Skeet2015-11-1931-524/+454
|\ \ \ | |_|/ |/| |
| * | Generated code changes and manual changes for previous commit.Jon Skeet2015-11-0928-468/+442
| * | Change how the reflection descriptor class is generated.Jon Skeet2015-11-093-56/+12
* | | Merge pull request #984 from thomasvl/prefix_validation_tweaksThomas Van Lenten2015-11-181-50/+51
|\ \ \
| * | | Reorder the checks so anything in the expected file is an implicit whitelisting.Thomas Van Lenten2015-11-171-50/+51
* | | | Merge pull request #982 from pherl/bazel_testJisi Liu2015-11-171-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Make the cc wkt proto target public.Jisi Liu2015-11-171-0/+1
* | | | Merge pull request #978 from thomasvl/conformance_tweaksJoshua Haberman2015-11-173-4/+17
|\ \ \ \ | |_|_|/ |/| | |
| * | | Cleanups of deps and ignores for conformanceThomas Van Lenten2015-11-163-4/+17
|/ / /
* | | Merge pull request #960 from thomasvl/xctool_supportThomas Van Lenten2015-11-091-6/+43
|\ \ \
| * | | Switch ObjC Travis testing to using xctoolThomas Van Lenten2015-11-091-6/+43
|/ / /
* | | Merge pull request #959 from thomasvl/travis_mac2Thomas Van Lenten2015-11-092-1/+34
|\ \ \ | |_|/ |/| |
| * | Add ObjC build to travis setupThomas Van Lenten2015-11-092-1/+34
|/ /
* | Merge pull request #954 from jskeet/blank-lines-in-commentsJan Tattermusch2015-11-0811-2/+133
|\ \