aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
| * Update nano to serialize java keywords properly.Tom Chao2013-07-199-11/+66
| * Make it possible to use MessageNano.mergeFrom without casting.Brian Duff2013-07-081-1/+1
| * Nano support for extensions and unknown fields.Brian Duff2013-06-247-21/+308
| * Fix enum field references with java_multiple_files.Brian Duff2013-06-072-4/+18
| * Fix javanano compiler generating uncompileable java code. This happenedBrian Duff2013-06-052-0/+64
| * Don't use Arrays.copyOf in generated code.Ficus Kirkpatrick2013-04-083-4/+20
| * Prevent conflicts between local and proto variable names.Ulas Kirazci2013-04-038-118/+68
| * Nano protobufs.Ulas Kirazci2013-04-0124-0/+3711
| * The j2me protobuf code is now in vendor/google; remove it here.Dan Egnor2009-11-135-1890/+0
| * Adds a few utilities to ProtoBufUtil, integrating over from mainlineAdam Bliss2009-06-102-12/+151
| * Revert "ProtoBuf update"Mitsuru Oshima2009-06-104-653/+171
| * ProtoBuf updateMitsuru Oshima2009-06-104-171/+653
| * auto import from //branches/cupcake_rel/...@140373The Android Open Source Project2009-03-181-0/+1
| * auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-034-0/+1750
| * auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-034-1716/+0
| * auto import from //depot/cupcake/@132589The Android Open Source Project2009-03-031-38/+4
| * auto import from //depot/cupcake/@137055The Android Open Source Project2009-03-021-4/+38
| * auto import from //branches/cupcake/...@132276The Android Open Source Project2009-02-193-41/+312
| * auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-101-0/+1
| * Initial ContributionThe Android Open Source Project2008-10-214-0/+1444
* Fix testcase compile failure under gcc 4.6:Tres Seaver2014-11-181-1/+1
* Fix 'error: a class-key must be used when declaring a friend' compile error.Tres Seaver2014-11-181-1/+1
* Merge pull request #84 from tseaver/fix_80-avoid_INT32_MAX_MINFeng Xiao2014-11-174-5/+2
|\
| * Use 'kint32min'/'kint32max' constants, rather than defining locally.Tres Seaver2014-11-174-20/+2
| * Don't rely on non-standard 'INT32_MAX' / 'INT32_MIN'.Tres Seaver2014-11-174-5/+20
* | Down-integrate from internal code base (C++ maps support).Feng Xiao2014-11-1481-3122/+8229
|/
* Merge pull request #69 from apaprocki/aix-atomicopsFeng Xiao2014-11-116-6/+469
|\
| * Modify tests to compile on AIX with xlC compiler.Andrew Paprocki2014-11-112-2/+5
| * Add atomicops for AIX/POWER + IBM xlC compiler.Andrew Paprocki2014-11-113-0/+459
| * Fixed IBM xlC compiler error due to missing prefix.Andrew Paprocki2014-10-311-4/+5
* | Merge branch 'typofixes-vlajos-20141108' of https://github.com/vlajos/protobu...Feng Xiao2014-11-1111-36/+36
|\ \
| * | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-0812-37/+37
* | | Down-integrate from internal code base.Feng Xiao2014-11-10153-4006/+18488
|/ /
* | Adds more checks before deleting temporary files.Feng Xiao2014-11-083-2/+8
* | Merge pull request #71 from abyss7/masterFeng Xiao2014-11-051-1/+1
|\ \
| * | Silence -Wsign-compare warning on Macabyss72014-11-031-1/+1
| |/
* | Merge pull request #70 from AustinSchuh/masterFeng Xiao2014-11-054-17/+19
|\ \
| * | Fixed Unused Parameter warning in compiler headers.Austin Schuh2014-10-311-5/+6
| * | Fixed Unused Parameter warning in headers.Austin Schuh2014-10-313-12/+13
| |/
* | Merge pull request #72 from Steelskin/masterFeng Xiao2014-11-052-2/+2
|\ \
| * | Change references to `vector` to use `std::vector`Fabrice de Gans-Riberi2014-11-032-2/+2
| |/
* / Corrected code example in coded_stream.hacidtonic2014-11-041-1/+1
|/
* Add the missing solaris atomics header file.Feng Xiao2014-10-221-1/+2
* Update version number to 2.6.2-pre.Feng Xiao2014-10-214-6/+6
* Update version number in generated files.Feng Xiao2014-10-092-2/+2
* Merge remote-tracking branch 'origin/master' into 2.6.1Feng Xiao2014-10-092-0/+17
|\
| * Merge pull request #43 from abuszta/bugfixFeng Xiao2014-10-092-0/+17
| |\
| | * DestroyDefaultRepeatedFields is registered using OnShutdown.Antoni Buszta2014-10-091-3/+1
| | * InitializeDefaultRepeatedFields() allocates memory but does not release it.Antoni Buszta2014-10-082-0/+19
* | | Update version number to 2.6.1rc1Feng Xiao2014-10-082-4/+4
|/ /
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-07 08:53:32 +0000