aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Fix typoGravatar Nobuaki Sukegawa2014-11-27
* Make Java TextFormat.printToUnicodeString() escape newlines.Gravatar Feng Xiao2014-11-25
* Merge pull request #106 from xfxyjwf/fix_62Gravatar Feng Xiao2014-11-25
|\
| * Fix javadoc warnings.Gravatar Feng Xiao2014-11-25
|/
* Merge pull request #104 from pherl/masterGravatar Jisi Liu2014-11-25
|\
| * Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2014-11-25
| |\ | |/ |/|
| * Link Java Nano generator into protoc.Gravatar Jisi Liu2014-11-25
* | Fix issue 99.Gravatar Feng Xiao2014-11-25
* | Merge pull request #103 from Ang3lus/masterGravatar Feng Xiao2014-11-25
|\ \ | |/ |/|
| * Fix "anonymous types declared in an anonymous union are an extension"Gravatar Łukasz Twarduś2014-11-25
|/
* Down-integrate from internal code base.Gravatar Feng Xiao2014-11-20
* Add nano proto authors and update LICENSE file to include Android.mk.Gravatar Feng Xiao2014-11-20
* Merge pull request #91 from xfxyjwf/android_nanoGravatar Feng Xiao2014-11-20
|\
| * Fix the broken link at the bottom of javanano/README.txtGravatar Feng Xiao2014-11-20
* | Merge pull request #79 from xfxyjwf/licenseGravatar Feng Xiao2014-11-20
|\ \
| | * Merge nano proto into protobuf repository.Gravatar Feng Xiao2014-11-19
| |/| |/| |
| | * Prepare nano proto code to be merged into protobuf repository.Gravatar Feng Xiao2014-11-19
* | | Merge pull request #89 from tseaver/ignore-map_generated_filesGravatar Feng Xiao2014-11-18
|\ \ \
| * | | Ignore files generated from new 'map*.protobuf' sources.Gravatar Tres Seaver2014-11-18
|/ / /
* | | Merge pull request #88 from tseaver/fix-class_key_must_be_declared_w_friendGravatar Feng Xiao2014-11-18
|\ \ \
| * | | Fix testcase compile failure under gcc 4.6:Gravatar Tres Seaver2014-11-18
| * | | Fix 'error: a class-key must be used when declaring a friend' compile error.Gravatar Tres Seaver2014-11-18
| * | | Merge remote-tracking branch 'upstream/master'Gravatar Tres Seaver2014-11-18
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #86 from tseaver/compat_w_git_lt_1.8Gravatar Feng Xiao2014-11-17
|\ \ \ \
* \ \ \ \ Merge pull request #84 from tseaver/fix_80-avoid_INT32_MAX_MINGravatar Feng Xiao2014-11-17
|\ \ \ \ \
| | * | | | Avoid '**/' patterns for compat w/ git < 1.8.Gravatar Tres Seaver2014-11-17
| * | | | | Use 'kint32min'/'kint32max' constants, rather than defining locally.Gravatar Tres Seaver2014-11-17
| | | * | | Exclude Python build artifacts.Gravatar Tres Seaver2014-11-17
| * | | | | Don't rely on non-standard 'INT32_MAX' / 'INT32_MIN'.Gravatar Tres Seaver2014-11-17
| |/ / / /
| | * | | Ignore generated test scaffolding files.Gravatar Tres Seaver2014-11-17
| | * | | Compat w/ git < 1.8.Gravatar Tres Seaver2014-11-17
| |/ / /
* / / / Down-integrate from internal code base (C++ maps support).Gravatar Feng Xiao2014-11-14
|/ / /
| * / Update LICENSE to list files that aren't copyrighted by Google Inc.Gravatar Feng Xiao2014-11-11
|/ /
* | Merge pull request #69 from apaprocki/aix-atomicopsGravatar Feng Xiao2014-11-11
|\ \
| * | Modify tests to compile on AIX with xlC compiler.Gravatar Andrew Paprocki2014-11-11
| * | Added contributor and updated README to add AIX.Gravatar Andrew Paprocki2014-11-11
| * | Add atomicops for AIX/POWER + IBM xlC compiler.Gravatar Andrew Paprocki2014-11-11
| | * Merge "Add platform versions of the protobuf libraries."Gravatar Dan Albert2014-11-11
| | |\
| | | * Add platform versions of the protobuf libraries.Gravatar Dan Albert2014-11-11
| | |/
* | | Merge branch 'typofixes-vlajos-20141108' of https://github.com/vlajos/protobu...Gravatar Feng Xiao2014-11-11
|\ \ \
* | | | Down-integrate from internal code base.Gravatar Feng Xiao2014-11-10
| * | | typo fixes - https://github.com/vlajos/misspell_fixerGravatar Veres Lajos2014-11-08
|/ / /
* | | Adds more checks before deleting temporary files.Gravatar Feng Xiao2014-11-08
* | | Merge pull request #50 from dlitz/compat-py3kGravatar Feng Xiao2014-11-08
|\ \ \
| | | * am dbb9c303: Merge "Added an API method in FieldData to allow access to the U...Gravatar Behrooz Khorashadi2014-11-06
| | | |\
| | | | * Merge "Added an API method in FieldData to allow access to the UnknownField d...Gravatar Behrooz Khorashadi2014-11-06
| | | | |\
* | | | | \ Merge pull request #71 from abyss7/masterGravatar Feng Xiao2014-11-05
|\ \ \ \ \ \
| | | | | | * Added an API method in FieldData to allow access to the UnknownField dataGravatar Behrooz Khorashadi2014-11-05
| | | | | |/
* | | | | | Merge pull request #70 from AustinSchuh/masterGravatar Feng Xiao2014-11-05
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge pull request #72 from Steelskin/masterGravatar Feng Xiao2014-11-05
|\ \ \ \ \ \ \