aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Rename protobuf Ruby module to google/protobuf and rework its buildChris Fallin2014-12-1220-62/+17557
* Merge pull request #128 from krishnanm86/masterFeng Xiao2014-12-122-14/+14
|\
| * Reverting the space at the end for both files changedKrishna2014-12-122-2/+2
| * Reverting the space at the endKrishna2014-12-121-1/+1
| * Returned print_indent and print_outdent back to printservicestub and printser...Krishna2014-12-121-5/+8
| * Reverted changes to cpp_helpers.cc and made code reviews to python_geenerator.ccKrishna2014-12-113-22/+20
| * Fixed bugsKrishna2014-12-103-5/+8
| * Source code refactoring. Extracted common functionality in cpp_helpers.cc and...Krishna2014-12-102-26/+22
* | Merge pull request #113 from nsuke/oneof-c++11Feng Xiao2014-12-115-41/+40
|\ \
| * | Make C++ string oneof field compatible with C++11Nobuaki Sukegawa2014-12-032-3/+2
| * | Display element name in test error logNobuaki Sukegawa2014-12-031-2/+2
| * | Make test code runnable with C++11Nobuaki Sukegawa2014-12-033-37/+37
| |/
* | Describe how to get gtest source for Visual Studio users.Feng Xiao2014-12-111-0/+7
* | Update gtest version to v1.7.0.Feng Xiao2014-12-111-3/+5
* | Update version number to v3.0.0-preFeng Xiao2014-12-103-4/+4
* | Merge branch v3.0.0-alpha-1 into master.Feng Xiao2014-12-1045-275/+972
|\ \
| * | 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
| |/
* | Merge pull request #121 from cfallin/masterJoshua Haberman2014-12-0922-4/+5378
|\ \
| * | Provide a Ruby extension.Chris Fallin2014-12-0922-4/+5378
|/ /
* | Merge pull request #127 from tseaver/ignore-autogen-artifactsFeng Xiao2014-12-091-0/+1
|\ \ | |/ |/|
| * Ignore artifacts from autogen.shTres Seaver2014-12-091-0/+1
|/
* 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
|\ \ \ \ \