aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Fixed remaining JSPB test failuresGravatar Adam Cozzette2016-11-21
* Updated message_test.js so that it does not depend on fromObjectGravatar Adam Cozzette2016-11-21
* Updated enum names in test.proto to avoid conflicting with testbinary.protoGravatar Adam Cozzette2016-11-21
* Update EXTRA_DIST lists.Gravatar Feng Xiao2016-11-18
* Update conformance failure lists.Gravatar Feng Xiao2016-11-18
* Add back missing LIBPROTOBUF_EXPORT.Gravatar Feng Xiao2016-11-17
* Updated libprotoc.cmakeGravatar Adam Cozzette2016-11-17
* Merge branch 'master' into down-integrate-with-msvc-fixGravatar Adam Cozzette2016-11-17
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
| * Merge pull request #2383 from snapsam/patch-1Gravatar Adam Cozzette2016-11-17
| |\
| * \ Merge pull request #2382 from zhsyourai/masterGravatar Adam Cozzette2016-11-17
| |\ \
| | | * Update README.mdGravatar Samuel Rossoff (of The Ebon Blade)2016-11-17
| | |/ | |/|
| | * Add LL to large constantGravatar zhsyourai2016-11-18
| |/
| * Rename Empty to GPBEmpty in php generated file.Gravatar Paul Yang2016-11-16
| * Merge pull request #2362 from wujingchao/patch-1Gravatar Adam Cozzette2016-11-16
| |\
| * \ Merge pull request #2378 from ianfhunter/patch-1Gravatar Adam Cozzette2016-11-16
| |\ \
| * \ \ Merge pull request #2367 from jbrianceau/add-missing-include-in-message-lite-ccGravatar Adam Cozzette2016-11-16
| |\ \ \
| | | * | typoGravatar Ian Hunter2016-11-16
| | |/ / | |/| |
| * | | Fix jenkins tests.Gravatar Feng Xiao2016-11-15
| * | | Merge pull request #2323 from marcinwyszynski/masterGravatar Joshua Haberman2016-11-15
| |\ \ \
| * \ \ \ Merge pull request #1907 from evokly/js-utf8-fixGravatar Joshua Haberman2016-11-15
| |\ \ \ \
| | * | | | JS: Well, this is the right place for surrogates.Gravatar Wojciech Mandrysz2016-11-15
| | * | | | JS: Re-added comment, moved surrogates code to the right placeGravatar Wojciech Mandrysz2016-11-15
| * | | | | Merge pull request #2366 from jbrianceau/reland-fix-include-js-generatorGravatar Feng Xiao2016-11-14
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #2368 from jbrianceau/fix-json-style-in-project-jsonGravatar Feng Xiao2016-11-14
| |\ \ \ \ \ \
| | * | | | | | Fix csharp/src/Google.Protobuf.Test/project.jsonGravatar Julien Brianceau2016-11-14
| |/ / / / / /
| | | | | * / Add missing include in message_lite.ccGravatar Julien Brianceau2016-11-14
| | |_|_|/ / | |/| | | |
| | * | | | Fix #include in js_generator.ccGravatar Julien Brianceau2016-11-14
| |/ / / /
| | | * | Move variable declarations before actual codeGravatar Marcin Wyszynski2016-11-14
| * | | | Merge pull request #2364 from haberman/jslicenseGravatar Joshua Haberman2016-11-14
| |\ \ \ \
| | * | | | Fixed JavaScript license declaration.Gravatar Josh Haberman2016-11-14
| |/ / / /
| | | | * Class is final but declares protected fieldGravatar wujingchao2016-11-14
| | |_|/ | |/| |
| * | | Merge pull request #2358 from ckennelly/masterGravatar Feng Xiao2016-11-11
| |\ \ \
| | * | | Resolve old TODO for StringTypeHandler.Gravatar Chris Kennelly2016-11-11
| |/ / /
| * | | Merge pull request #2353 from guptasu/masterGravatar Feng Xiao2016-11-11
| |\ \ \
| * \ \ \ Merge pull request #2357 from D3Hunter/masterGravatar Feng Xiao2016-11-11
| |\ \ \ \
| | * | | | #2356 : fix ExceptionInInitializerError on IBM J9Gravatar Time2016-11-11
| |/ / / /
| * | | | Fix php c extension on 32-bit machines. (#2348)Gravatar Paul Yang2016-11-10
| * | | | Merge pull request #2337 from sergiocampama/deprecationGravatar Feng Xiao2016-11-10
| |\ \ \ \
| | | * | | Made helper code also consider package name 'proto2' when dealing with Messag...Gravatar guptasu2016-11-10
| | |/ / / | |/| | |
| | * | | Fixing references to the removed atomicops_internals_pnacl.h file.Gravatar Sergio Campama2016-11-10
| * | | | Merge pull request #2332 from Kwizatz/masterGravatar Adam Cozzette2016-11-09
| |\ \ \ \
| * \ \ \ \ Merge pull request #2327 from ctubbsii/fix-maven-compiler-pluginGravatar Adam Cozzette2016-11-09
| |\ \ \ \ \
| * | | | | | Implement RepeatedFieldIter for c extension. (#2333)Gravatar Paul Yang2016-11-08
| | | | * | | Renamed the pnacl version of atomicops.h into C11 atomic, and flagged the mac...Gravatar Sergio Campama2016-11-07
| | |_|/ / / | |/| | | |
| | | * | | Added explicit cast to avoid size warning on Win64.Gravatar Rodrigo Hernandez2016-11-04
| | |/ / / | |/| | |
| * | | | Merge pull request #2329 from acozzette/unused-parameterGravatar Adam Cozzette2016-11-04
| |\ \ \ \
| * \ \ \ \ Merge pull request #2330 from manupsunny/masterGravatar Jisi Liu2016-11-04
| |\ \ \ \ \
| | * | | | | Fix message for InvalidProtocolBufferExceptionGravatar Msp2016-11-04
| |/ / / / /
| | * / / / Fix unused parameter warnings in arena_freeGravatar Adam Cozzette2016-11-04
| |/ / / /