4179 Commits (5d63097fc2b7f405f53d6ca4ad3c1ebd98d80ddd)
 

Author SHA1 Message Date
Adam Cozzette 5d63097fc2 Merge branch 'master' into down-integrate-with-msvc-fix 8 years ago
Adam Cozzette 5a76e633ea Integrated internal changes from Google 8 years ago
Adam Cozzette cd315dcbad Merge pull request #2383 from snapsam/patch-1 8 years ago
Adam Cozzette 44edefaef6 Merge pull request #2382 from zhsyourai/master 8 years ago
Samuel Rossoff (of The Ebon Blade) d571d39923 Update README.md 8 years ago
zhsyourai 14c147ea79 Add LL to large constant 8 years ago
Paul Yang 99564c3347 Rename Empty to GPBEmpty in php generated file. 8 years ago
Adam Cozzette fc27ead107 Merge pull request #2362 from wujingchao/patch-1 8 years ago
Adam Cozzette a3dfbe6e52 Merge pull request #2378 from ianfhunter/patch-1 8 years ago
Adam Cozzette 01d321c2d6 Merge pull request #2367 from jbrianceau/add-missing-include-in-message-lite-cc 8 years ago
Ian Hunter 130bb0739a typo 8 years ago
Feng Xiao 83d6411bf3 Fix jenkins tests. 8 years ago
Joshua Haberman bf379715c9 Merge pull request #2323 from marcinwyszynski/master 8 years ago
Joshua Haberman c6f3d700b9 Merge pull request #1907 from evokly/js-utf8-fix 8 years ago
Wojciech Mandrysz bd850a25f5 JS: Well, this is the right place for surrogates. 8 years ago
Wojciech Mandrysz 292c2c91cf JS: Re-added comment, moved surrogates code to the right place 8 years ago
Feng Xiao 6e93fa41c4 Merge pull request #2366 from jbrianceau/reland-fix-include-js-generator 8 years ago
Feng Xiao a95d052bdb Merge pull request #2368 from jbrianceau/fix-json-style-in-project-json 8 years ago
Julien Brianceau 3c0e0ce2b0 Fix csharp/src/Google.Protobuf.Test/project.json 8 years ago
Julien Brianceau aac9ed8e39 Add missing include in message_lite.cc 8 years ago
Julien Brianceau 3316062e98 Fix #include in js_generator.cc 8 years ago
Marcin Wyszynski 74a636a7a2 Move variable declarations before actual code 8 years ago
Joshua Haberman 0c0f7e2aa8 Merge pull request #2364 from haberman/jslicense 8 years ago
Josh Haberman 5d9dbe3ecc Fixed JavaScript license declaration. 8 years ago
wujingchao abeff7b4fd Class is final but declares protected field 8 years ago
Feng Xiao a30e5af204 Merge pull request #2358 from ckennelly/master 8 years ago
Chris Kennelly e02cb2bb83 Resolve old TODO for StringTypeHandler. 8 years ago
Feng Xiao 8a4b2c573a Merge pull request #2353 from guptasu/master 8 years ago
Feng Xiao df56736db9 Merge pull request #2357 from D3Hunter/master 8 years ago
Time ed08341234 #2356 : fix ExceptionInInitializerError on IBM J9 8 years ago
Paul Yang df8390790a Fix php c extension on 32-bit machines. (#2348) 8 years ago
Feng Xiao 9f75c5aa85 Merge pull request #2337 from sergiocampama/deprecation 8 years ago
guptasu fce8b6b924 Made helper code also consider package name 'proto2' when dealing with MessageOptions. 8 years ago
Sergio Campama e75cf40e8f Fixing references to the removed atomicops_internals_pnacl.h file. 8 years ago
Adam Cozzette ce5160b83b Merge pull request #2332 from Kwizatz/master 8 years ago
Adam Cozzette d584321fb4 Merge pull request #2327 from ctubbsii/fix-maven-compiler-plugin 8 years ago
Paul Yang 1f2dbc899b Implement RepeatedFieldIter for c extension. (#2333) 8 years ago
Sergio Campama ecc460ab1b Renamed the pnacl version of atomicops.h into C11 atomic, and flagged the mac version to that if atomic is enabled 8 years ago
Rodrigo Hernandez 975d577a2b Added explicit cast to avoid size warning on Win64. 8 years ago
Adam Cozzette 0d7199edc8 Merge pull request #2329 from acozzette/unused-parameter 8 years ago
Jisi Liu ca800ea823 Merge pull request #2330 from manupsunny/master 8 years ago
Msp 089aaa996a Fix message for InvalidProtocolBufferException 8 years ago
Adam Cozzette 8785004c80 Fix unused parameter warnings in arena_free 8 years ago
Christopher Tubbs eb7f3a3ad1 Use latest maven-compiler-plugin (2.6.0) 8 years ago
Feng Xiao 7bd11fcb59 Merge pull request #2301 from jbrianceau/arm-atomic-kuser-helpers-fix-v2 8 years ago
Jon Skeet 4c310d78a2 Update conformance test failure list 8 years ago
Jon Skeet 50a37e0135 Change JSON field name formatting 8 years ago
Marcin Wyszynski cb81314b1b Fix copy pasta in test 8 years ago
Marcin Wyszynski 3bdaaa5dda More Ruby-eqsue interface 8 years ago
Jisi Liu 93a4fa23d0 Merge pull request #2302 from jbrianceau/generic-gcc-atomics-strong-cmpxchg 8 years ago