aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix csharp/src/Google.Protobuf.Test/project.jsonJulien Brianceau2016-11-141-1/+1
* Merge pull request #2364 from haberman/jslicenseJoshua Haberman2016-11-141-1/+1
|\
| * Fixed JavaScript license declaration.Josh Haberman2016-11-141-1/+1
|/
* Merge pull request #2358 from ckennelly/masterFeng Xiao2016-11-111-15/+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 #2357 from D3Hunter/masterFeng Xiao2016-11-111-1/+1
|\ \
| * | #2356 : fix ExceptionInInitializerError on IBM J9Time2016-11-111-1/+1
|/ /
* | Fix php c extension on 32-bit machines. (#2348)Paul Yang2016-11-107-17/+187
* | Merge pull request #2337 from sergiocampama/deprecationFeng Xiao2016-11-104-116/+120
|\ \ | |/ |/|
| * Fixing references to the removed atomicops_internals_pnacl.h file.Sergio Campama2016-11-102-112/+112
| * Renamed the pnacl version of atomicops.h into C11 atomic, and flagged the mac...Sergio Campama2016-11-072-4/+8
* | Merge pull request #2332 from Kwizatz/masterAdam Cozzette2016-11-091-1/+1
|\ \
| * | Added explicit cast to avoid size warning on Win64.Rodrigo Hernandez2016-11-041-1/+1
| |/
* | Merge pull request #2327 from ctubbsii/fix-maven-compiler-pluginAdam Cozzette2016-11-095-14/+77
|\ \
| * | Use latest maven-compiler-plugin (2.6.0)Christopher Tubbs2016-11-045-14/+77
* | | Implement RepeatedFieldIter for c extension. (#2333)Paul Yang2016-11-085-3/+155
| |/ |/|
* | Merge pull request #2329 from acozzette/unused-parameterAdam Cozzette2016-11-041-0/+1
|\ \
| * | Fix unused parameter warnings in arena_freeAdam Cozzette2016-11-041-0/+1
| |/
* | Merge pull request #2330 from manupsunny/masterJisi Liu2016-11-042-2/+2
|\ \ | |/ |/|
| * Fix message for InvalidProtocolBufferExceptionMsp2016-11-042-2/+2
|/
* Merge pull request #2301 from jbrianceau/arm-atomic-kuser-helpers-fix-v2Feng Xiao2016-11-031-0/+4
|\
| * [arm/gcc] Don't rely on KUSER_HELPERS feature for atomicsJulien Brianceau2016-10-281-0/+4
* | Update conformance test failure listJon Skeet2016-11-031-4/+0
* | Change JSON field name formattingJon Skeet2016-11-034-85/+23
* | Merge pull request #2302 from jbrianceau/generic-gcc-atomics-strong-cmpxchgJisi Liu2016-11-021-5/+5
|\ \
| * | generic atomicops: Use strong compare_exchangeJulien Brianceau2016-10-281-5/+5
| |/
* | Merge pull request #2318 from mavrukin/patch-1Feng Xiao2016-11-021-4/+4
|\ \
| * | Fix compiler warnings when running :protobuf_testMichael Avrukin2016-11-021-4/+4
|/ /
* | Merge pull request #2307 from sinzianag/swift_protobufFeng Xiao2016-10-311-0/+1
|\ \
| * | Adding Apple's Swift ProtobufSinziana Gafitanu2016-10-301-0/+1
* | | Merge pull request #2309 from thomasvl/note_about_coding_supportThomas Van Lenten2016-10-311-1/+10
|\ \ \ | |_|/ |/| |
| * | Add note about extension use and Coding support.Thomas Van Lenten2016-10-311-1/+10
|/ /
* | Adds pushLimit: and popLimit: into GPBCodedInputStream (#2297)Sergio Campamá2016-10-272-0/+29
* | Trigger update of docker for new changes in #2282. (#2288)Paul Yang2016-10-272-0/+2
* | Merge pull request #2290 from ramrunner/OpenBSDsupportFeng Xiao2016-10-261-2/+2
|\ \
| * | define no_threadlocal on OpenBSDramrunner2016-10-261-2/+2
|/ /
* | Merge pull request #2284 from pherl/plugin_optJisi Liu2016-10-263-17/+93
|\ \
| * | Add comments about converting directives into PluginNameJisi Liu2016-10-261-1/+2
| * | Support extra parameters for plugins.Jisi Liu2016-10-253-16/+91
| |/
* / Fix pure php implementation for 32-bit machine. (#2282)Paul Yang2016-10-2517-392/+545
|/
* Merge pull request #2274 from nmittler/gaeFeng Xiao2016-10-201-5/+45
|\
| * Hacking ByteBufferWriter to work with GAEnmittler2016-10-201-5/+45
|/
* Merge pull request #2264 from rshin/masterFeng Xiao2016-10-192-4/+8
|\
| * Use -DPROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOSRichard Shin2016-10-191-0/+4
| * Place Python extensions correctly in Bazel build.Richard Shin2016-10-181-4/+4
|/
* Merge pull request #2254 from JasonLunn/patch-1Feng Xiao2016-10-161-0/+2
|\
| * Use git clean before installing via bundlerJason Lunn2016-10-141-0/+2
|/
* Merge pull request #1959 from abergmeier-dsfishlabs/feature/cppFeng Xiao2016-10-131-7/+17
|\