Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Merge pull request #586 from jtattermusch/csharp_names_export | Jan Tattermusch | 2015-07-16 | 1 | -0/+1 | |
| |\ \ \ | | |/ / | |/| | | Export c# naming routines publicly | |||||
| | * | | export c# naming routines publicly | Jan Tattermusch | 2015-07-10 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Merge remote-tracking branch 'upstream/master' into csharp-experimental | Jan Tattermusch | 2015-07-15 | 2 | -2/+1 | |
| |\ \ \ | | |/ / | |/| | | ||||||
| * | | | First pass at map support. | Jon Skeet | 2015-06-25 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | More tests required. Generated code in next commit. | |||||
| * | | | Merge remote-tracking branch 'upstream/master' into proto3-only | Jon Skeet | 2015-06-19 | 6 | -136/+77 | |
| |\ \ \ | ||||||
| * | | | | 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 | 5 | -0/+12 | |
| |_|_|/ |/| | | | | | | | | | | | Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4 | |||||
* | | | | update header list. | Jisi Liu | 2015-07-17 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | Change-Id: I75459b8b6562c3ac58fa4b1e4513accdda43ad64 | |||||
* | | | | Update make file for extra headers. | Jisi Liu | 2015-07-17 | 1 | -0/+6 | |
| |_|/ |/| | | | | | | | | Change-Id: Ifbc415755266ba3d0ffa5661fcd7c7d2e3b32a22 | |||||
* | | | remove pbconfig from extract script | Jisi Liu | 2015-07-13 | 1 | -1/+0 | |
| | | | | | | | | | | | | Change-Id: I5049da7449cbada781aa1e23485a336b584802cb | |||||
* | | | fix typo in cmake/README.md | Jan Tattermusch | 2015-06-24 | 1 | -1/+1 | |
| |/ |/| | ||||||
* | | Merge pull request #505 from pherl/bazel | Jisi Liu | 2015-06-18 | 2 | -122/+0 | |
|\ \ | | | | | | | Add bazel support for the project | |||||
| * | | Move cmake/update_file_lists.sh preparing for bazel support. | Jisi Liu | 2015-06-17 | 2 | -122/+1 | |
| |/ | | | | | | | Change-Id: Idecb2e3a5169f7b40d832242c9c10b0eb4325654 | |||||
* | | Merge pull request #501 from xfxyjwf/down | Feng Xiao | 2015-06-17 | 5 | -14/+77 | |
|\ \ | |/ |/| | Down-integrate from internal code base. | |||||
| * | Fix broken builds. | Feng Xiao | 2015-06-17 | 4 | -3/+12 | |
| | | ||||||
| * | Down-integrate from internal code base. | Feng Xiao | 2015-06-15 | 5 | -14/+68 | |
| | | | | | | | | | | | | [ci skip] Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d | |||||
* | | Make the code independent of config.h | Jisi Liu | 2015-06-16 | 4 | -139/+7 | |
|/ | | | | | | | | | | | | | Now the Build tool needs to define -DHAVE_ZLIB and -DHAVE-PTHREAD rather than providing a config.h - Make pbconfig.h a manually written file to handle hash conditions according to platform related macros. - Remove #include "config.h" from source code. - Changed the configure.ac and Makefile.am to pass down the macros. - Change cmake to pass down the the macros. Change-Id: I537249d5df8fdeba189706aec436d1ab1104a4dc | |||||
* | Merge pull request #481 from Qartar/master | Feng Xiao | 2015-06-12 | 1 | -0/+1 | |
|\ | | | | | Workaround for MSVC's string literal compiler limit. | |||||
| * | Workaround for MSVC's string literal compiler limit. | Qartar | 2015-06-12 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | Escape characters don't count for string literal size, no need to pre-generate escape string. Added unit test to touch enormous cpp generated descriptor. Updated makefile to include enormous_descriptor.proto Fixed language compatibility error. | |||||
* | | Remove vsprojects. | Feng Xiao | 2015-06-05 | 1 | -12/+24 | |
|/ | ||||||
* | Update ./update_file_lists.sh. | Feng Xiao | 2015-06-05 | 3 | -10/+127 | |
| | | | | Make it executable and generate extract_includes.bat in the same directory. | |||||
* | Add back incorrectly excluded cmake targets. | Feng Xiao | 2015-06-05 | 1 | -1/+2 | |
| | ||||||
* | Fix README.md formatting. | Feng Xiao | 2015-06-04 | 1 | -34/+43 | |
| | | | | Change-Id: I121cb70bfdc4894c297ab1a36f1db47736c0652b | |||||
* | Add an cmake option to exclude tests. | Feng Xiao | 2015-06-04 | 1 | -2/+4 | |
| | ||||||
* | Add cmake support. | Feng Xiao | 2015-05-31 | 11 | -0/+748 | |