aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into fix-authorJisi Liu2015-10-0586-2090/+4997
|\
| * 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
| | * | | | Review commentsPeter Kasting2015-08-271-2/+1
| | * | | | Refine check for unordered_{map|set} availability.Peter Kasting2015-08-271-4/+4
| * | | | | Merge pull request #802 from bsilver8192/masterFeng Xiao2015-09-082-1/+13
| |\ \ \ \ \
| | * | | | | Don't assume char is signed.Brian Silverman2015-09-081-1/+6
| | * | | | | Use TEST_TMPDIR for writing temporary files if it's set.Brian Silverman2015-09-081-0/+7
| |/ / / / /
| * | | | | Merge pull request #786 from pherl/masterJisi Liu2015-09-081-0/+5
| |\ \ \ \ \
| | * | | | | Update objc script in generate_descriptor_proto.shJisi Liu2015-09-081-0/+5
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #796 from jcanizales/add-missing-commaPaul Yang2015-09-041-1/+1
| |\ \ \ \ \
| | * | | | | Fix podspec by adding missing commaJorge Canizales2015-09-041-1/+1
| |/ / / / /
| * | | | | Merge pull request #794 from jskeet/anyJan Tattermusch2015-09-046-0/+151
| |\ \ \ \ \
| | * | | | | Pack/Unpack implementation for Any.Jon Skeet2015-09-046-0/+151
| |/ / / / /
| * | | | | Merge pull request #772 from dano/fix_scalar_mapJoshua Haberman2015-09-047-85/+167
| |\ \ \ \ \
| | * | | | | Fix Python 3.4 cpp implementationDan O'Reilly2015-08-317-85/+167
| | |/ / / /
| * | | | | Merge pull request #793 from kbinani/fix_redefinition_BYTE_SIZE_macroFeng Xiao2015-09-031-12/+12
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Rename 'BYTE_SIZE' macro to 'GOOGLE_PROTOBUF_BYTE_SIZE'kbinani2015-09-041-12/+12
| |/ / / /
* / / / / Down-integrate from google internal.Jisi Liu2015-10-05112-962/+3562
|/ / / /
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-22 02:28:28 +0000