Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Integrate from google internal. | Jisi Liu | 2016-01-29 | 1 | -0/+1 |
| | | | | | Java files are moved to un-do the hack in the prevous commit, which moved the java files to the original position for integration. | ||||
* | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 | 1 | -0/+1 |
| | |||||
* | Rename "umbrella" to "reflection" consistently. | Jon Skeet | 2015-11-19 | 1 | -1/+1 |
| | | | | This changes csharp_names.h, which will require a corresponding change in GRPC. | ||||
* | Merge pull request #783 from podsvirov/topic-cmake-project | Feng Xiao | 2015-10-16 | 1 | -2/+9 |
|\ | | | | | Improved CMake project | ||||
| * | Improved SHARED build from CMake project | Konstantin Podsvirov | 2015-10-15 | 1 | -1/+7 |
| | | |||||
| * | Add CMake option protobuf_DEBUG_POSTFIX | Konstantin Podsvirov | 2015-09-17 | 1 | -1/+2 |
| | | |||||
* | | First pass at generating XML documentation from .proto comments. | Jon Skeet | 2015-10-01 | 1 | -0/+1 |
|/ | | | | | | This could be tidied up significantly, and at some point we will want to parse the markdown and generate more appropriate XML - but this is definitely better than nothing. Generated code changes coming in next commit. | ||||
* | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2015-08-21 | 1 | -2/+2 |
|\ | | | | | | | Change-Id: If3fb07754a734bae610d95124528e073515ac525 | ||||
| * | First part of implementing wrapper types. Not ready yet! | Jon Skeet | 2015-07-16 | 1 | -0/+1 |
| | | |||||
| * | First pass at map support. | Jon Skeet | 2015-06-25 | 1 | -0/+1 |
| | | | | | | | | More tests required. Generated code in next commit. | ||||
| * | Updates to handle use of cmake for Windows builds. | Jon Skeet | 2015-06-17 | 1 | -2/+0 |
| | | |||||
* | | Down-integrate from internal branch. | Jisi Liu | 2015-08-21 | 1 | -0/+1 |
|/ | | | | Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4 | ||||
* | Add cmake support. | Feng Xiao | 2015-05-31 | 1 | -0/+95 |