Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into down-integrate | Adam Cozzette | 2018-03-13 |
|\ | |||
* | | Integrated internal changes from Google | Adam Cozzette | 2018-03-13 |
| | | |||
| * | Only check filenames when end with .py in _CalledFromGeneratedFile() (#4262) | Jie Luo | 2018-02-09 |
|/ | | | | * Cython's stack does not have .py file name. Only check filenames when end with .py for _CalledFromGeneratedFile() | ||
* | Merge from Google internal for 3.4 release | Jisi Liu | 2017-07-18 |
| | |||
* | Down-integrate from google3. | Feng Xiao | 2017-03-29 |
| | |||
* | Integrate internal changes | Bo Yang | 2016-10-10 |
| | |||
* | Integrated internal changes from Google | Adam Cozzette | 2016-06-29 |
| | | | | This includes all internal changes from around May 20 to now. | ||
* | Down integrate from Google internal. | Jisi Liu | 2016-04-28 |
| | |||
* | Integrate google internal changes. | Jisi Liu | 2016-03-30 |
| | |||
* | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 |
| | |||
* | Removed all warnings from the Python/C++ build. | Josh Haberman | 2015-10-28 |
| | | | | | | | | | | | Also made the Travis build ensure that no warnings are present. These builds were previously spewing many warnings, which was hiding warnings for important things like accidentally using C++11-only features. Change-Id: I56caeee9db48bc78756a3e8d7c14874630627037 | ||
* | Down-integrate from google internal. | Jisi Liu | 2015-10-05 |
| | |||
* | Down-integrate from internal code base. | Feng Xiao | 2015-08-23 |
| | |||
* | Down-integrate from google3. | Feng Xiao | 2015-08-22 |
| | |||
* | down-integrate internal changes | Bo Yang | 2015-05-21 |
| | |||
* | Down integrate from Google internal branch for C++ and Java. | Jisi Liu | 2015-02-28 |
| | | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13 | ||
* | Fixes for Python/C++ implementation in open-source: | Josh Haberman | 2015-02-25 |
| | | | | | | | | | | | | | * 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. | ||
* | Down integrate from Google internal. | Jisi Liu | 2015-02-25 |
| | | | | Change-Id: I34d301133eea9c6f3a822c47d1f91e136fd33145 | ||
* | Fix Python C++ implementation build issues: | Feng Xiao | 2014-11-25 |
| | | | | | 1. Haven't included the include path for "config.h". 2. Use of C++11 auto keyword. | ||
* | Down-integrate from internal code base. | Feng Xiao | 2014-11-10 |
| | |||
* | Replace links to code.google.com/protobuf with ↵ | Feng Xiao | 2014-10-01 |
| | | | | developers.google.com/protocol-buffers | ||
* | down integrate python opensource to svn | jieluo@google.com | 2014-08-12 |