Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Provide a Ruby extension. | Chris Fallin | 2014-12-09 | 22 | -4/+5378 | |
|/ / / | ||||||
* | | | Merge pull request #127 from tseaver/ignore-autogen-artifacts | Feng Xiao | 2014-12-09 | 1 | -0/+1 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Ignore artifacts from autogen.sh | Tres Seaver | 2014-12-09 | 1 | -0/+1 | |
|/ / | ||||||
* | | Explicitly list all Java lite runtime tests (and exclude those depending | Feng Xiao | 2014-12-02 | 1 | -2/+4 | |
* | | Merge pull request #116 from xfxyjwf/fix_warnings | Feng Xiao | 2014-12-02 | 7 | -9/+13 | |
|\ \ | ||||||
| * | | Get rid of some build warnings. | Feng Xiao | 2014-12-02 | 7 | -9/+13 | |
* | | | Merge pull request #115 from xfxyjwf/fix_107 | Feng Xiao | 2014-12-02 | 2 | -33/+47 | |
|\ \ \ | ||||||
| * | | | Add a ./configure flag "DIST_LANG" to select which langauge to include | Feng Xiao | 2014-12-02 | 2 | -33/+47 | |
| |/ / | ||||||
* | | | Merge pull request #111 from xfxyjwf/googlebot | Feng Xiao | 2014-12-02 | 27 | -27/+27 | |
|\ \ \ | ||||||
| * | | | Replace links in nano proto code. | Feng Xiao | 2014-11-26 | 27 | -27/+27 | |
* | | | | Merge pull request #105 from xfxyjwf/fix_92 | Feng Xiao | 2014-12-02 | 2 | -5/+9 | |
|\ \ \ \ | ||||||
| * | | | | Fix Python C++ implementation build issues: | Feng Xiao | 2014-11-25 | 2 | -5/+9 | |
* | | | | | Merge pull request #81 from xfxyjwf/syntax_warning | Feng Xiao | 2014-12-02 | 2 | -0/+13 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Report a warning if the proto file doesn't have a syntax statement. | Feng Xiao | 2014-11-14 | 2 | -0/+13 | |
* | | | | | Merge pull request #102 from fizbin/bytestring_serializable | Feng Xiao | 2014-11-27 | 7 | -1/+90 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add tests for other ByteString subclasses | Daniel Martin | 2014-11-27 | 2 | -0/+37 | |
| * | | | | | Make ByteStrings serializable with java serialization. | Daniel Martin | 2014-11-25 | 5 | -1/+53 | |
* | | | | | | Merge pull request #109 from nsuke/tb-vim-oneof | Feng Xiao | 2014-11-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add oneof keyword to proto.vim | Nobuaki Sukegawa | 2014-11-27 | 1 | -1/+1 | |
* | | | | | | | 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 | |
| | | |\ \ \ |