aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Add a missing Java dist file.Gravatar Feng Xiao2014-12-03
* Update version number in descriptor.pb.h and plugin.pb.h. Protect deathGravatar Feng Xiao2014-12-03
* Update version number to v3.0.0-alpha-1Gravatar Feng Xiao2014-12-03
* Explicitly list all Java lite runtime tests (and exclude those dependingGravatar Feng Xiao2014-12-02
* Merge pull request #116 from xfxyjwf/fix_warningsGravatar Feng Xiao2014-12-02
|\
* \ Merge pull request #115 from xfxyjwf/fix_107Gravatar Feng Xiao2014-12-02
|\ \
* \ \ Merge pull request #111 from xfxyjwf/googlebotGravatar Feng Xiao2014-12-02
|\ \ \
* \ \ \ Merge pull request #105 from xfxyjwf/fix_92Gravatar Feng Xiao2014-12-02
|\ \ \ \
* \ \ \ \ Merge pull request #81 from xfxyjwf/syntax_warningGravatar Feng Xiao2014-12-02
|\ \ \ \ \
| | | | | * Get rid of some build warnings.Gravatar Feng Xiao2014-12-02
| |_|_|_|/ |/| | | |
| | | | * Add a ./configure flag "DIST_LANG" to select which langauge to includeGravatar Feng Xiao2014-12-02
| |_|_|/ |/| | |
* | | | Merge pull request #102 from fizbin/bytestring_serializableGravatar Feng Xiao2014-11-27
|\ \ \ \
| * | | | Add tests for other ByteString subclassesGravatar Daniel Martin2014-11-27
* | | | | Merge pull request #109 from nsuke/tb-vim-oneofGravatar Feng Xiao2014-11-26
|\ \ \ \ \
* \ \ \ \ \ Merge pull request #110 from nsuke/tb-typo-cpp_extensionGravatar Feng Xiao2014-11-26
|\ \ \ \ \ \
| | | | | | * Replace links in nano proto code.Gravatar Feng Xiao2014-11-26
| |_|_|_|_|/ |/| | | | |
* | | | | | Down-integrate from internal code base.Gravatar Feng Xiao2014-11-26
| * | | | | Fix typoGravatar Nobuaki Sukegawa2014-11-27
|/ / / / /
| * / / / Add oneof keyword to proto.vimGravatar 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
|/ / / /
| | | * Fix Python C++ implementation build issues: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
|/ / /
| * / Make ByteStrings serializable with java serialization.Gravatar Daniel Martin2014-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