aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Expand)AuthorAge
* Rename protobuf Ruby module to google/protobuf and rework its buildGravatar Chris Fallin2014-12-12
* Merge pull request #128 from krishnanm86/masterGravatar Feng Xiao2014-12-12
|\
| * Reverting the space at the end for both files changedGravatar Krishna2014-12-12
| * Reverting the space at the endGravatar Krishna2014-12-12
| * Returned print_indent and print_outdent back to printservicestub and printser...Gravatar Krishna2014-12-12
* | Merge pull request #113 from nsuke/oneof-c++11Gravatar Feng Xiao2014-12-11
|\ \
| | * Reverted changes to cpp_helpers.cc and made code reviews to python_geenerator.ccGravatar Krishna2014-12-11
* | | Merge branch v3.0.0-alpha-1 into master.Gravatar Feng Xiao2014-12-10
|\ \ \
| | | * Fixed bugsGravatar Krishna2014-12-10
| | | * Source code refactoring. Extracted common functionality in cpp_helpers.cc and...Gravatar Krishna2014-12-10
| * | | Fix LIBPROTOBUF_PROTOBUF annotations for buliding protobuf as DLLs.Gravatar Feng Xiao2014-12-09
* | | | Provide a Ruby extension.Gravatar Chris Fallin2014-12-09
| |_|/ |/| |
| * | Remove map_field.cc from lite-runtime.Gravatar Feng Xiao2014-12-09
| * | Fix compile issues and test failures in VS2008.Gravatar Feng Xiao2014-12-05
| * | Fix thread local annotatoin and add back type traits is_convertable for MSVCGravatar Feng Xiao2014-12-04
| * | Replace is_enum with is_proto_enum because is_enum is not supported on some p...Gravatar Feng Xiao2014-12-03
| * | Delete some globals in ShutdownProtobufLibrary().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
|/ /
| * Make C++ string oneof field compatible with C++11Gravatar Nobuaki Sukegawa2014-12-03
| * Display element name in test error logGravatar Nobuaki Sukegawa2014-12-03
| * Make test code runnable with C++11Gravatar Nobuaki Sukegawa2014-12-03
|/
* Merge pull request #116 from xfxyjwf/fix_warningsGravatar 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
| |/ |/|
* | Merge pull request #110 from nsuke/tb-typo-cpp_extensionGravatar Feng Xiao2014-11-26
|\ \
* | | Down-integrate from internal code base.Gravatar Feng Xiao2014-11-26
| * | Fix typoGravatar Nobuaki Sukegawa2014-11-27
|/ /
* | 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
| * | Fix "anonymous types declared in an anonymous union are an extension"Gravatar Łukasz Twarduś2014-11-25
|/ /
* | Down-integrate from internal code base.Gravatar 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
* | | 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 pull request #84 from tseaver/fix_80-avoid_INT32_MAX_MINGravatar Feng Xiao2014-11-17
|\ \ \
| * | | Use 'kint32min'/'kint32max' constants, rather than defining locally.Gravatar Tres Seaver2014-11-17
| * | | Don't rely on non-standard 'INT32_MAX' / 'INT32_MIN'.Gravatar Tres Seaver2014-11-17
| | | * Report a warning if the proto file doesn't have a syntax statement.Gravatar Feng Xiao2014-11-14
| |_|/ |/| |
* | | Down-integrate from internal code base (C++ maps support).Gravatar Feng Xiao2014-11-14
|/ /
* | Merge pull request #69 from apaprocki/aix-atomicopsGravatar Feng Xiao2014-11-11
|\ \
| * | Modify tests to compile on AIX with xlC compiler.Gravatar Andrew Paprocki2014-11-11
| * | Add atomicops for AIX/POWER + IBM xlC compiler.Gravatar Andrew Paprocki2014-11-11
* | | Merge branch 'typofixes-vlajos-20141108' of https://github.com/vlajos/protobu...Gravatar Feng Xiao2014-11-11
|\ \ \
* | | | Down-integrate from internal code base.Gravatar Feng Xiao2014-11-10
| * | | typo fixes - https://github.com/vlajos/misspell_fixerGravatar Veres Lajos2014-11-08
|/ / /
* | | Adds more checks before deleting temporary files.Gravatar Feng Xiao2014-11-08
* | | Merge pull request #71 from abyss7/masterGravatar Feng Xiao2014-11-05
|\ \ \