Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Display element name in test error log | Nobuaki Sukegawa | 2014-12-03 | 1 | -2/+2 |
| | |||||
* | Make test code runnable with C++11 | Nobuaki Sukegawa | 2014-12-03 | 3 | -37/+37 |
| | | | | | Preprocessor token right after string literal without whitespace results in parse failure in C++11. | ||||
* | Explicitly list all Java lite runtime tests (and exclude those depending | Feng Xiao | 2014-12-02 | 1 | -2/+4 |
| | | | | TestUtil which transitively depend on the full runtime). | ||||
* | Merge pull request #116 from xfxyjwf/fix_warnings | Feng Xiao | 2014-12-02 | 7 | -9/+13 |
|\ | | | | | Get rid of some build warnings. | ||||
| * | 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". | ||||
| * | | Add a ./configure flag "DIST_LANG" to select which langauge to include | Feng Xiao | 2014-12-02 | 2 | -33/+47 |
| |/ | | | | | | | in a distribution package. | ||||
* | | Merge pull request #111 from xfxyjwf/googlebot | Feng Xiao | 2014-12-02 | 27 | -27/+27 |
|\ \ | | | | | | | Replace links in nano proto code. | ||||
| * | | 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 | ||||
| * | | | Fix Python C++ implementation build issues: | Feng Xiao | 2014-11-25 | 2 | -5/+9 |
| | | | | | | | | | | | | | | | | | | | | 1. Haven't included the include path for "config.h". 2. Use of C++11 auto keyword. | ||||
* | | | | 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. | ||||
| * | | | 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 |
|\ \ \ \ | | | | | | | | | | | Make ByteStrings serializable with java serialization. | ||||
| * | | | | 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 | ||||
| * | | | | | 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 | ||||
| * | | | | | 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 |
| | | | | | | | | | | | | | | | | Fix issue #77 | ||||
* | | | | Merge pull request #106 from xfxyjwf/fix_62 | Feng Xiao | 2014-11-25 | 2 | -14/+14 |
|\ \ \ \ | |_|_|/ |/| | | | Fix javadoc warnings. | ||||
| * | | | 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 |
|\ \ \ | | | | | | | | | Link Java Nano generator into protoc. | ||||
| * \ \ | 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" warning when using clang with -pedantic switch | ||||
| * | | | Fix "anonymous types declared in an anonymous union are an extension" | Łukasz Twarduś | 2014-11-25 | 1 | -3/+6 |
|/ / / | | | | | | | | | | warning when using clang with -pedantic switch | ||||
| * / | 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 |
|\ \ | | | | | | | Merge nano proto into protobuf repository. | ||||
| * | | 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 |
| |\ \ | | | | | | | | | | | | | Source: https://android.googlesource.com/platform/external/protobuf.git | ||||
| | * | | 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 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NDK libraries should not be linked in to platform code, so create a separate version for the platform that is linked against libc++ instead of the NDK STLs. Bug: 15193147 Change-Id: I3935e5dd3bd99676772a4b9681e275ef3601b855 | ||||
| | * | | am dbb9c303: Merge "Added an API method in FieldData to allow access to the ↵ | Behrooz Khorashadi | 2014-11-06 | 1 | -0/+17 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UnknownField data" * commit 'dbb9c3033097e571e15c16d6e2e814be7e9d60bc': Added an API method in FieldData to allow access to the UnknownField data | ||||
| | | * \ | Merge "Added an API method in FieldData to allow access to the UnknownField ↵ | Behrooz Khorashadi | 2014-11-06 | 1 | -0/+17 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | data" | ||||
| | | | * | | Added an API method in FieldData to allow access to the UnknownField data | Behrooz Khorashadi | 2014-11-05 | 1 | -0/+17 |
| | | |/ / | | | | | | | | | | | | | | | | Change-Id: I2cd5cfc80dce2a297fcd2511074b2a9d23d39837 | ||||
| | * | | | am 1ed1ec36: Merge "Move protobuf 2.3.0 to prebuilts." | Jeff Davidson | 2014-10-29 | 1 | -10/+13 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | * commit '1ed1ec3609812a7818689cde01b6ce92d3f2315a': Move protobuf 2.3.0 to prebuilts. | ||||
| | | * | | 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 |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will facilitate an upgrade to 2.6.0 and future versions without breaking applications which have a hardcoded dependency on 2.3.0. The existing make rules have been renamed to omit the version code. The prebuilts were built from a tree at commit 9be7e7401174d75e87e21fdc5f43549594a714bb. Change-Id: I90cf7f029217c8dc63a4b38252025c6b725d72a5 | ||||
| | * | | | am 9be7e740: Merge "Change reftypes_primitive_enums to reftypes_compat_mode." | Brian Duff | 2014-10-03 | 3 | -12/+31 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | * commit '9be7e7401174d75e87e21fdc5f43549594a714bb': Change reftypes_primitive_enums to reftypes_compat_mode. | ||||
| | | * | | 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 |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Make the clear() method stripped in reftypes_compat_mode. Change-Id: I0ec35537856f59a6ecf231bfd74df995c858e2b2 | ||||
| | * | | | am 7d1ca13f: Merge "Adds a primitive enum mode for reftypes." | Brian Duff | 2014-10-01 | 4 | -4/+23 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | * commit '7d1ca13f3781e8ccff0ecfab42250f1058c9152d': Adds a primitive enum mode for reftypes. | ||||
| | | * | | 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 |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | This is a compatibility shim. Change-Id: Ia0b417d4621e391ede618d0b3b1c470c9896e0ff |