aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2496 from xyzzyz/fix-overflowFeng Xiao2016-12-131-1/+1
|\
| * Fix integer overflow in FastUInt32ToBufferLeftAdam Michalik2016-12-131-1/+1
* | Merge pull request #2493 from jbrianceau/add-missing-climits-includeFeng Xiao2016-12-133-0/+3
|\ \
| * | Add missing include in embed.ccJulien Brianceau2016-12-131-0/+1
| * | Add missing includesJulien Brianceau2016-12-132-0/+2
* | | Merge pull request #2484 from ngg/uwp_buildFeng Xiao2016-12-1316-94/+95
|\ \ \ | |_|/ |/| |
| * | Add support for Windows ARM buildsGergely Nagy2016-12-1216-94/+95
* | | Merge pull request #2487 from jtattermusch/csharp_leading_whitespaceJan Tattermusch2016-12-131-1/+1
|\ \ \ | |_|/ |/| |
| * | remove leading whitespace in C# xml commentsJan Tattermusch2016-12-121-1/+1
* | | Merge pull request #2471 from jbrianceau/fix-include-styleFeng Xiao2016-12-121-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix #include in cc filesJulien Brianceau2016-12-091-1/+1
* | | Merge pull request #2454 from pongad/go_packageFeng Xiao2016-12-122-5/+6
|\ \ \ | |_|/ |/| |
| * | update descriptor.proto's go_packageMichael Darakananda2016-12-072-5/+6
* | | Use uint32 in GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET macroAdam Cozzette2016-12-091-4/+4
| |/ |/|
* | Update commit id in Dockerfile to trigger update. (#2467)Paul Yang2016-12-081-3/+0
* | Merge pull request #2462 from jbrianceau/fix-comp-builds-part2Feng Xiao2016-12-0813-91/+94
|\ \
| * | Regenerate descriptor protoJulien Brianceau2016-12-0812-88/+88
| * | C++: export _xxx_default_instance_ symbolsJulien Brianceau2016-12-081-3/+6
* | | Merge pull request #2461 from jbrianceau/add-missing-include-in-embed-ccFeng Xiao2016-12-081-0/+1
|\ \ \
| * | | Add missing include in embed.ccJulien Brianceau2016-12-081-0/+1
| |/ /
* | | Make php generated code conform to PSR-4. (#2435)Paul Yang2016-12-081-169/+310
* | | Improve ObjC deprecated annotation support.Thomas Van Lenten2016-12-085-6/+37
|/ /
* | Send all protobuf logging to logcat by default on AndroidAdam Cozzette2016-12-071-2/+11
* | Export symbols used in inline functionsJulien Brianceau2016-12-071-1/+1
|/
* Merge pull request #2437 from xfxyjwf/pluginFeng Xiao2016-12-0610-41/+1058
|\
| * Add version number to plugin protocol.Feng Xiao2016-12-0510-41/+1058
* | Merge pull request #2445 from ramrunner/masterFeng Xiao2016-12-051-1/+5
|\ \
| * | when on OpenBSD we include the correct headers for endianess and check the ap...ramrunner2016-12-051-1/+5
* | | Factored Conformance and Benchmark test messages into shared test schema. (#1...Joshua Haberman2016-12-031-0/+227
| |/ |/|
* | Generate phpdoc in php generated files. (#2406)Paul Yang2016-12-011-115/+268
* | Add a swift_prefix file option.Thomas Van Lenten2016-11-303-143/+334
* | Merge pull request #2403 from google/down-integrate-with-msvc-fixAdam Cozzette2016-11-23218-12817/+13199
|\ \
| * | Add a "u" suffix to tag numbers in generated codeAdam Cozzette2016-11-2216-258/+258
| * | Add back missing LIBPROTOBUF_EXPORT.Feng Xiao2016-11-171-1/+1
| * | Merge branch 'master' into down-integrate-with-msvc-fixAdam Cozzette2016-11-1717-171/+278
| |\ \
| * | | Integrated internal changes from GoogleAdam Cozzette2016-11-17218-12630/+13000
* | | | C++: Fix use with GOOGLE_PROTOBUF_NO_STATIC_INITIALIZERJulien Brianceau2016-11-211-1/+1
| |/ / |/| |
* | | Add LL to large constantzhsyourai2016-11-181-4/+4
* | | Rename Empty to GPBEmpty in php generated file.Paul Yang2016-11-161-2/+16
* | | Merge pull request #2367 from jbrianceau/add-missing-include-in-message-lite-ccAdam Cozzette2016-11-161-0/+1
|\ \ \
| * | | Add missing include in message_lite.ccJulien Brianceau2016-11-141-0/+1
* | | | Fix #include in js_generator.ccJulien Brianceau2016-11-141-1/+1
|/ / /
* | | Resolve old TODO for StringTypeHandler.Chris Kennelly2016-11-111-15/+1
* | | Merge pull request #2353 from guptasu/masterFeng Xiao2016-11-113-10/+27
|\ \ \
| * | | Made helper code also consider package name 'proto2' when dealing with Messag...guptasu2016-11-103-10/+27
* | | | Merge pull request #2337 from sergiocampama/deprecationFeng Xiao2016-11-103-115/+119
|\ \ \ \ | |/ / / |/| | |
| * | | Fixing references to the removed atomicops_internals_pnacl.h file.Sergio Campama2016-11-101-111/+111
| * | | Renamed the pnacl version of atomicops.h into C11 atomic, and flagged the mac...Sergio Campama2016-11-072-4/+8
* | | | Added explicit cast to avoid size warning on Win64.Rodrigo Hernandez2016-11-041-1/+1
|/ / /
* | | Fix unused parameter warnings in arena_freeAdam Cozzette2016-11-041-0/+1