aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix LIBPROTOBUF_PROTOBUF annotations for buliding protobuf as DLLs.v3.0.0-alpha-1Feng Xiao2014-12-098-18/+33
* Remove map_field.cc from lite-runtime.Feng Xiao2014-12-092-5/+1
* Fix vsprojects/extract_includes.batFeng Xiao2014-12-091-69/+69
* Fix the intermediate directory of vc project files.Feng Xiao2014-12-097-14/+14
* Down-integrate from internal code base.Feng Xiao2014-12-093-1/+112
* Fix compile issues and test failures in VS2008.Feng Xiao2014-12-0514-90/+112
* Update VC projects to include new source files.Feng Xiao2014-12-044-135/+631
* Fix thread local annotatoin and add back type traits is_convertable for MSVCFeng Xiao2014-12-044-4/+10
* Remove usage of features not supported in Java 1.6.Feng Xiao2014-12-031-3/+2
* Replace is_enum with is_proto_enum because is_enum is not supported on some p...Feng Xiao2014-12-031-1/+3
* Update post_process_dist.sh to produce a separate package for eachFeng Xiao2014-12-032-11/+18
* Delete some globals in ShutdownProtobufLibrary().Feng Xiao2014-12-033-0/+37
* Add a missing Java dist file.Feng Xiao2014-12-032-3/+5
* Update version number in descriptor.pb.h and plugin.pb.h. Protect deathFeng Xiao2014-12-034-4/+8
* Update version number to v3.0.0-alpha-1Feng Xiao2014-12-035-12/+12
* Explicitly list all Java lite runtime tests (and exclude those dependingFeng Xiao2014-12-021-2/+4
* Merge pull request #116 from xfxyjwf/fix_warningsFeng Xiao2014-12-027-9/+13
|\
| * Get rid of some build warnings.Feng Xiao2014-12-027-9/+13
* | Merge pull request #115 from xfxyjwf/fix_107Feng Xiao2014-12-022-33/+47
|\ \
| * | Add a ./configure flag "DIST_LANG" to select which langauge to includeFeng Xiao2014-12-022-33/+47
| |/
* | Merge pull request #111 from xfxyjwf/googlebotFeng Xiao2014-12-0227-27/+27
|\ \
| * | Replace links in nano proto code.Feng Xiao2014-11-2627-27/+27
* | | Merge pull request #105 from xfxyjwf/fix_92Feng Xiao2014-12-022-5/+9
|\ \ \
| * | | Fix Python C++ implementation build issues:Feng Xiao2014-11-252-5/+9
* | | | Merge pull request #81 from xfxyjwf/syntax_warningFeng Xiao2014-12-022-0/+13
|\ \ \ \ | |_|_|/ |/| | |
| * | | Report a warning if the proto file doesn't have a syntax statement.Feng Xiao2014-11-142-0/+13
* | | | Merge pull request #102 from fizbin/bytestring_serializableFeng Xiao2014-11-277-1/+90
|\ \ \ \
| * | | | Add tests for other ByteString subclassesDaniel Martin2014-11-272-0/+37
| * | | | Make ByteStrings serializable with java serialization.Daniel Martin2014-11-255-1/+53
* | | | | Merge pull request #109 from nsuke/tb-vim-oneofFeng Xiao2014-11-261-1/+1
|\ \ \ \ \
| * | | | | Add oneof keyword to proto.vimNobuaki Sukegawa2014-11-271-1/+1
* | | | | | Merge pull request #110 from nsuke/tb-typo-cpp_extensionFeng Xiao2014-11-261-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix typoNobuaki Sukegawa2014-11-271-1/+1
| |/ / / /
* / / / / Down-integrate from internal code base.Feng Xiao2014-11-268-45/+221
|/ / / /
* | | | Make Java TextFormat.printToUnicodeString() escape newlines.Feng Xiao2014-11-252-6/+15
* | | | Merge pull request #106 from xfxyjwf/fix_62Feng Xiao2014-11-252-14/+14
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix javadoc warnings.Feng Xiao2014-11-252-14/+14
|/ / /
* | | Merge pull request #104 from pherl/masterJisi Liu2014-11-252-0/+27
|\ \ \
| * \ \ Merge branch 'master' of github.com:google/protobufJisi Liu2014-11-256-10/+54
| |\ \ \ | |/ / / |/| | |
* | | | Fix issue 99.Feng Xiao2014-11-255-7/+48
* | | | Merge pull request #103 from Ang3lus/masterFeng Xiao2014-11-251-3/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix "anonymous types declared in an anonymous union are an extension"Łukasz Twarduś2014-11-251-3/+6
|/ / /
| * / Link Java Nano generator into protoc.Jisi Liu2014-11-252-0/+27
|/ /
* | Down-integrate from internal code base.Feng Xiao2014-11-2019-201/+624
* | Add nano proto authors and update LICENSE file to include Android.mk.Feng Xiao2014-11-202-0/+8
* | Merge pull request #91 from xfxyjwf/android_nanoFeng Xiao2014-11-2057-0/+15021
|\ \
| * | Fix the broken link at the bottom of javanano/README.txtFeng Xiao2014-11-201-1/+1
| * | Merge nano proto into protobuf repository.Feng Xiao2014-11-1957-0/+15021
| |\ \
| | * | Prepare nano proto code to be merged into protobuf repository.Feng Xiao2014-11-1946-394/+249
| | * | Merge "Add platform versions of the protobuf libraries."Dan Albert2014-11-111-0/+37
| | |\ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-15 00:46:25 +0000