Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:google/protobuf into integrate_from_master | Jan Tattermusch | 2015-05-13 | 1 | -1/+36 |
|\ | |||||
| * | Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs. | Thomas Van Lenten | 2015-05-06 | 1 | -0/+25 |
| | | |||||
| * | Include well-known type protos in "make install". | Feng Xiao | 2015-04-23 | 1 | -1/+11 |
| | | |||||
* | | Merge pull request #288 from jtattermusch/csharp_protobuf_reviewed | Jie Luo | 2015-04-17 | 1 | -2/+33 |
|\ \ | |/ |/| | C# protocol buffers (initial pull request) | ||||
| * | forgot to include header files into automake template | Jan Tattermusch | 2015-04-17 | 1 | -1/+15 |
| | | |||||
| * | Rewrote C# protogen to C++ (initial version) | Jan Tattermusch | 2015-03-26 | 1 | -2/+19 |
| | | |||||
* | | Change fixture name to be consistent | Tamir Duberstein | 2015-03-31 | 1 | -3/+3 |
|/ | | | | | This fixes the problem where `make check` generates files not ignored by `.gitignore`. | ||||
* | Revert pull request 175: Add support for the TILE-Gx processor family. | Bo Yang | 2015-03-14 | 1 | -1/+0 |
| | |||||
* | Add a missing proto file. | Feng Xiao | 2015-03-13 | 1 | -1/+4 |
| | | | | Change-Id: Ic98584616bd6ee49680273f0cdbe6d9c038ec0e9 | ||||
* | Merge pull request #175 from martiert/tile-support | Jisi Liu | 2015-03-05 | 1 | -0/+1 |
|\ | | | | | Add support for the TILE-Gx processor family. | ||||
| * | Add support for the TILE-Gx processor family. | Martin Ertsaas | 2015-01-22 | 1 | -0/+1 |
| | | |||||
* | | Down integrate from Google internal branch for C++ and Java. | Jisi Liu | 2015-02-28 | 1 | -3/+16 |
| | | | | | | | | | | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13 | ||||
* | | Fix the order of BUILT_FILES so that pbconfig.h will be built before | Jisi Liu | 2015-02-25 | 1 | -1/+1 |
| | | | | | | | | | | | | anyother targets. Change-Id: I507009cd92a711739d7d58ccee93dfbf0a9fe135 | ||||
* | | Exclude pbconfg.h from dist, otherwise it breaks VS builds. | Jisi Liu | 2015-02-25 | 1 | -3/+4 |
| | | | | | | | | Change-Id: I7f745929b137b93c122448a4a2d9a7bbab6648d6 | ||||
* | | Merge pull request #221 from google/python_proto3 | Jisi Liu | 2015-02-25 | 1 | -0/+1 |
|\ \ | | | | | | | Proto3 Python changes for v3.0.0-alpha-2 | ||||
| * | | Fixes for Python/C++ implementation in open-source: | Josh Haberman | 2015-02-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rosy hack doesn't apply (that test should be removed for the open-source release). * Added our own copy of parameterized.py (the open-source version of Google Apputils doesn't contain it). * The C++ Descriptor object didn't implement extension_ranges. * Had to implement a hack around returning EncodeError, to work around the module-loading behavior of the test runner. | ||||
* | | | Include shared_ptr.h into headers to make maps proto work. It is used | Jisi Liu | 2015-02-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | in the map_field_inl.h Change-Id: Ieeaab5507ee34b317d76b5937beb67c298905eb4 | ||||
* | | | Make maps fields work on installed C++ protobufs. | Jisi Liu | 2015-02-25 | 1 | -4/+21 |
|/ / | | | | | | | Change-Id: Id937e25bbb35968ee76c92bd4a8ce6247408c443 | ||||
* | | Merge pull request #204 from pherl/master | Jisi Liu | 2015-02-17 | 1 | -10/+12 |
|\ \ | | | | | | | Implement maps for JavaNano | ||||
| * | | Initial checkin for maps support in JavaNano. | Jisi Liu | 2015-01-30 | 1 | -10/+12 |
| |/ | |||||
* / | Two tests for Ruby code generator: | Chris Fallin | 2015-01-14 | 1 | -0/+1 |
|/ | | | | | | | | | | | | - A golden-file test that ensures protoc produces known-valid output. - A Ruby test that loads that golden file and ensures it actually works with the extension. This split strategy allows us to test end-to-end without needing to integrate the Ruby gem build system and the protoc build system. This is desirable because we do not want a gem build/install to depend on building protoc, and we do not want building protoc to depend on building and testing the gem. | ||||
* | Align backslash vertically | zhangkun83 | 2015-01-12 | 1 | -1/+1 |
| | |||||
* | Include names.h as java_names.h in the opensource tree | zhangkun83 | 2015-01-12 | 1 | -0/+1 |
| | |||||
* | Add missing header files in src/Makefile.am | Feng Xiao | 2014-12-12 | 1 | -1/+3 |
| | |||||
* | Merge branch v3.0.0-alpha-1 into master. | Feng Xiao | 2014-12-10 | 1 | -4/+4 |
|\ | | | | | | | | | Conflicts: configure.ac | ||||
| * | Remove map_field.cc from lite-runtime. | Feng Xiao | 2014-12-09 | 1 | -1/+1 |
| | | |||||
| * | Update version number to v3.0.0-alpha-1 | Feng Xiao | 2014-12-03 | 1 | -3/+3 |
| | | |||||
* | | Provide a Ruby extension. | Chris Fallin | 2014-12-09 | 1 | -1/+2 |
|/ | | | | | | This adds a Ruby extension in ruby/ that is based on the 'upb' library (now included as a submodule), and adds support for Ruby code generation to the protoc compiler. | ||||
* | Link Java Nano generator into protoc. | Jisi Liu | 2014-11-25 | 1 | -0/+21 |
| | |||||
* | Down-integrate from internal code base (C++ maps support). | Feng Xiao | 2014-11-14 | 1 | -0/+22 |
| | |||||
* | Down-integrate from internal code base. | Feng Xiao | 2014-11-10 | 1 | -22/+63 |
| | |||||
* | Add the missing solaris atomics header file. | Feng Xiao | 2014-10-22 | 1 | -1/+2 |
| | |||||
* | Update version number to 2.6.2-pre. | Feng Xiao | 2014-10-21 | 1 | -3/+3 |
| | |||||
* | Update version number to 2.6.1rc1 | Feng Xiao | 2014-10-08 | 1 | -3/+3 |
| | |||||
* | merge tags/2.6.0 into trunk | jieluo@google.com | 2014-08-25 | 1 | -1/+2 |
| | |||||
* | make dist complains the file name is too long and refuse to put it to tar. ↵ | jieluo@google.com | 2014-08-14 | 1 | -1/+3 |
| | | | | Change the file to a shorter name | ||||
* | down integrate python opensource to svn | jieluo@google.com | 2014-08-12 | 1 | -0/+4 |
| | |||||
* | down integrate to svn | jieluo@google.com | 2014-07-18 | 1 | -4/+20 |
| | |||||
* | Update version number in trunk | xiaofeng@google.com | 2013-02-28 | 1 | -3/+3 |
| | |||||
* | Fix a typo of nacl file name. | liujisi@google.com | 2013-01-10 | 1 | -1/+1 |
| | |||||
* | Add arm_qnx atomic ops support and add missing header files in Makefile.am | liujisi@google.com | 2013-01-10 | 1 | -0/+2 |
| | |||||
* | Merge from tags/2.5.0rc1 to trunk | xiaofeng@google.com | 2012-12-04 | 1 | -45/+47 |
| | |||||
* | Fix issues: 342, 424, 428, 430, 436 | xiaofeng@google.com | 2012-12-04 | 1 | -2/+2 |
| | |||||
* | Update version to 2.5.0-pre | liujisi@google.com | 2012-11-30 | 1 | -3/+3 |
| | |||||
* | Down-integrate from internal branch | xiaofeng@google.com | 2012-09-22 | 1 | -2/+22 |
| | |||||
* | Update atomicops to support new platforms where intptr_t = long. | liujisi@google.com | 2012-06-05 | 1 | -1/+1 |
| | | | | Fix license headers. | ||||
* | Add atomicops from V8. | pliard@google.com | 2012-03-02 | 1 | -0/+8 |
| | |||||
* | Boost version number to 2.4.0-pre, add more test cases for text_format.py ↵ | liujisi@google.com | 2010-12-09 | 1 | -3/+3 |
| | | | | about unicode field. | ||||
* | Fix issues: 166 167 172 175 181 188 192 194 195. | liujisi@google.com | 2010-12-03 | 1 | -1/+0 |
| | |||||
* | Submit recent changes from internal branch. See CHANGES.txt for more details. | liujisi@google.com | 2010-11-02 | 1 | -0/+2 |
| |