aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Generated code changes for previous commit.Jon Skeet2015-09-2919-34/+34
| * | | Move the summary comments above the attributes.Jon Skeet2015-09-292-9/+9
| * | | Generated code for previous commitJon Skeet2015-09-2919-0/+62
| * | | Added documentation to generated code.Jon Skeet2015-09-294-3/+11
| |/ /
* | | Merge pull request #836 from jcanizales/fix-version-numberPaul Yang2015-09-291-1/+1
|\ \ \
| * | | Fix Podspec version numberJorge Canizales2015-09-291-1/+1
| |/ /
* | | Merge pull request #831 from haberman/ruby-tinyfixJoshua Haberman2015-09-292-2/+7
|\ \ \ | |/ / |/| |
| * | A very small fix to silence some warnings.Josh Haberman2015-09-282-2/+7
|/ /
* | Merge pull request #727 from AustinSchuh/arena_bounds_fixFeng Xiao2015-09-241-0/+3
|\ \
| * | Handled blocks being too small in arena.ccAustin Schuh2015-08-281-0/+3
* | | Merge pull request #785 from jskeet/csharp-directoriesJan Tattermusch2015-09-2326-762/+1095
|\ \ \
| * | | Regenerated code. Most changes are whitespace, removing trailing spaces.Jon Skeet2015-09-0119-741/+1033
| * | | Stop adding a space to the end of lines for descriptor binary data.Jon Skeet2015-09-011-1/+1
| * | | Specify csharp_namespace in descriptor.protoJon Skeet2015-09-012-4/+3
| * | | Generate a directory hierarchy based on namespace (C#)Jon Skeet2015-09-013-14/+58
| * | | Remove vestigial reference to MakeFixedTagJon Skeet2015-09-011-2/+0
| | |/ | |/|
* | | Merge pull request #813 from 0xAAE/masterFeng Xiao2015-09-161-0/+8
|\ \ \
| * | | Add GOOGLE_ATTRIBUTE_NOINLINE to GetArena() and GetMaybeArenaPointer() method...0xAAE2015-09-151-0/+8
|/ / /
* | | Merge pull request #769 from pkasting/metadataFeng Xiao2015-09-101-1/+1
|\ \ \
| * | | Change to just not marking the class for exportPeter Kasting2015-08-275-47/+3
| * | | Fix compile failures building protobuf DLLs on MSVC in Chromium's codebase.Peter Kasting2015-08-275-2/+46
* | | | Merge pull request #766 from pkasting/hashFeng Xiao2015-09-101-4/+4
|\ \ \ \
| * | | | It helps if you write macros correctlyPeter Kasting2015-08-271-2/+2
| * | | | Try modifying check in hopes of passing upstream buildPeter Kasting2015-08-271-2/+3