Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #110 from nsuke/tb-typo-cpp_extension | Feng Xiao | 2014-11-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | Fix typo | Nobuaki Sukegawa | 2014-11-27 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* / / / / / | Down-integrate from internal code base. | Feng Xiao | 2014-11-26 | 8 | -45/+221 | |
|/ / / / / | ||||||
* | | | | | Make Java TextFormat.printToUnicodeString() escape newlines. | Feng Xiao | 2014-11-25 | 2 | -6/+15 | |
* | | | | | Merge pull request #106 from xfxyjwf/fix_62 | Feng Xiao | 2014-11-25 | 2 | -14/+14 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Fix javadoc warnings. | Feng Xiao | 2014-11-25 | 2 | -14/+14 | |
|/ / / / | ||||||
* | | | | Merge pull request #104 from pherl/master | Jisi Liu | 2014-11-25 | 2 | -0/+27 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2014-11-25 | 6 | -10/+54 | |
| |\ \ \ \ | |/ / / / |/| | | | | ||||||
* | | | | | Fix issue 99. | Feng Xiao | 2014-11-25 | 5 | -7/+48 | |
* | | | | | Merge pull request #103 from Ang3lus/master | Feng Xiao | 2014-11-25 | 1 | -3/+6 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Fix "anonymous types declared in an anonymous union are an extension" | Łukasz Twarduś | 2014-11-25 | 1 | -3/+6 | |
|/ / / / | ||||||
| * / / | Link Java Nano generator into protoc. | Jisi Liu | 2014-11-25 | 2 | -0/+27 | |
|/ / / | ||||||
* | | | Down-integrate from internal code base. | Feng Xiao | 2014-11-20 | 19 | -201/+624 | |
* | | | Add nano proto authors and update LICENSE file to include Android.mk. | Feng Xiao | 2014-11-20 | 2 | -0/+8 | |
* | | | Merge pull request #91 from xfxyjwf/android_nano | Feng Xiao | 2014-11-20 | 57 | -0/+15021 | |
|\ \ \ | ||||||
| * | | | Fix the broken link at the bottom of javanano/README.txt | Feng Xiao | 2014-11-20 | 1 | -1/+1 | |
| * | | | Merge nano proto into protobuf repository. | Feng Xiao | 2014-11-19 | 57 | -0/+15021 | |
| |\ \ \ | ||||||
| | * | | | Prepare nano proto code to be merged into protobuf repository. | Feng Xiao | 2014-11-19 | 46 | -394/+249 | |
| | * | | | Merge "Add platform versions of the protobuf libraries." | Dan Albert | 2014-11-11 | 1 | -0/+37 | |
| | |\ \ \ | ||||||
| | | * | | | Add platform versions of the protobuf libraries. | Dan Albert | 2014-11-11 | 1 | -0/+37 | |
| | |/ / / | ||||||
| | * | | | am dbb9c303: Merge "Added an API method in FieldData to allow access to the U... | Behrooz Khorashadi | 2014-11-06 | 1 | -0/+17 | |
| | |\ \ \ | ||||||
| | | * \ \ | Merge "Added an API method in FieldData to allow access to the UnknownField d... | Behrooz Khorashadi | 2014-11-06 | 1 | -0/+17 | |
| | | |\ \ \ | ||||||
| | | | * | | | Added an API method in FieldData to allow access to the UnknownField data | Behrooz Khorashadi | 2014-11-05 | 1 | -0/+17 | |
| | | |/ / / | ||||||
| | * | | | | am 1ed1ec36: Merge "Move protobuf 2.3.0 to prebuilts." | Jeff Davidson | 2014-10-29 | 1 | -10/+13 | |
| | |\| | | | ||||||
| | | * | | | Merge "Move protobuf 2.3.0 to prebuilts." | Jeff Davidson | 2014-10-28 | 1 | -10/+13 | |
| | | |\ \ \ | ||||||
| | | | * | | | Move protobuf 2.3.0 to prebuilts. | Jeff Davidson | 2014-10-22 | 1 | -10/+13 | |
| | | |/ / / | ||||||
| | * | | | | am 9be7e740: Merge "Change reftypes_primitive_enums to reftypes_compat_mode." | Brian Duff | 2014-10-03 | 3 | -12/+31 | |
| | |\| | | | ||||||
| | | * | | | Merge "Change reftypes_primitive_enums to reftypes_compat_mode." | Brian Duff | 2014-10-02 | 3 | -12/+31 | |
| | | |\ \ \ | ||||||
| | | | * | | | Change reftypes_primitive_enums to reftypes_compat_mode. | Brian Duff | 2014-10-01 | 3 | -12/+31 | |
| | | |/ / / | ||||||
| | * | | | | am 7d1ca13f: Merge "Adds a primitive enum mode for reftypes." | Brian Duff | 2014-10-01 | 4 | -4/+23 | |
| | |\| | | | ||||||
| | | * | | | Merge "Adds a primitive enum mode for reftypes." | Brian Duff | 2014-10-01 | 4 | -4/+23 | |
| | | |\ \ \ | ||||||
| | | | * | | | Adds a primitive enum mode for reftypes. | Brian Duff | 2014-09-30 | 4 | -4/+23 | |
| | | |/ / / | ||||||
| | * | | | | am d3a8acb9: Merge "Includes a MessageNano subclass\'s name\'s hashCode in ha... | Brian Duff | 2014-09-17 | 1 | -0/+1 | |
| | |\| | | | ||||||
| | | * | | | Merge "Includes a MessageNano subclass's name's hashCode in hashCode calculat... | Brian Duff | 2014-09-17 | 1 | -0/+1 | |
| | | |\ \ \ | ||||||
| | | | * | | | Includes a MessageNano subclass's name's hashCode in hashCode calculations. | Jason Neufeld | 2014-09-16 | 1 | -0/+1 | |
| | | |/ / / | ||||||
| | * | | | | am c4e7b92f: Merge "Make the tag field public." | Brian Duff | 2014-09-03 | 1 | -1/+1 | |
| | |\| | | | ||||||
| | | * | | | Merge "Make the tag field public." | Brian Duff | 2014-09-03 | 1 | -1/+1 | |
| | | |\ \ \ | ||||||
| | | | * | | | Make the tag field public. | Brian Duff | 2014-09-02 | 1 | -1/+1 | |
| | | |/ / / | ||||||
| | * | | | | am ddf016d8: Merge "Add MessageNano.messageNanoEquals()." | Brian Duff | 2014-09-02 | 2 | -0/+29 | |
| | |\| | | | ||||||
| | | * | | | Merge "Add MessageNano.messageNanoEquals()." | Brian Duff | 2014-09-02 | 2 | -0/+29 | |
| | | |\ \ \ | ||||||
| | | | * | | | Add MessageNano.messageNanoEquals(). | Brian Duff | 2014-09-02 | 2 | -0/+29 | |
| | | |/ / / | ||||||
| | * | | | | am 0068978c: Merge "Fixed octal printing of bytearrays" | Max Cai | 2014-08-29 | 1 | -1/+1 | |
| | |\| | | | ||||||
| | | * | | | Merge "Fixed octal printing of bytearrays" | Max Cai | 2014-08-29 | 1 | -1/+1 | |
| | | |\ \ \ | ||||||
| | | | * | | | Fixed octal printing of bytearrays | Linus Tufvesson | 2014-08-29 | 1 | -1/+1 | |
| | | |/ / / | ||||||
| | * | | | | am 77866143: Merge "Revert "Fixed octal printing of bytearrays"" | Max Cai | 2014-08-29 | 1 | -1/+1 | |
| | |\| | | | ||||||
| | | * | | | Merge "Revert "Fixed octal printing of bytearrays"" | Max Cai | 2014-08-28 | 1 | -1/+1 | |
| | | |\ \ \ | ||||||
| | | | * | | | Revert "Fixed octal printing of bytearrays" | Max Cai | 2014-08-28 | 1 | -1/+1 | |
| | * | | | | | am 238e0ac5: Merge "Fixed octal printing of bytearrays" | Max Cai | 2014-08-29 | 1 | -1/+1 | |
| | |\| | | | | ||||||
| | | * | | | | Merge "Fixed octal printing of bytearrays" | Max Cai | 2014-08-28 | 1 | -1/+1 | |
| | | |\| | | | ||||||
| | | | * | | | Fixed octal printing of bytearrays | Linus Tufvesson | 2014-08-28 | 1 | -1/+1 | |
| | | |/ / / |