Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | Bump csharp version | Jisi Liu | 2017-08-02 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge pull request #3438 from pherl/changelog | Jisi Liu | 2017-08-02 | 1 | -0/+128 | |
| |\| | | | | | | | | | | Update change log | |||||
| | * | | Update change log | Jisi Liu | 2017-08-01 | 1 | -0/+128 | |
| | | | | ||||||
| * | | | Merge pull request #3419 from pherl/3.4.x | Jisi Liu | 2017-08-01 | 85 | -1295/+3022 | |
| |\| | | | | | | | | | | Merge master into 3.4.x | |||||
| | * | | remove the duplication | Jisi Liu | 2017-08-01 | 1 | -1/+0 | |
| | | | | ||||||
| | * | | Adding the missing header | Jisi Liu | 2017-08-01 | 1 | -0/+1 | |
| | | | | ||||||
| | * | | Export functions in io_win32.h in win DLL build | Jisi Liu | 2017-08-01 | 1 | -13/+14 | |
| | | | | | | | | | | | | | | | | | | | | Previous code duplicates io_win32.cc in sources of all the libraries that include io_win32.h header. | |||||
| | * | | Update conformance tests again. | Jisi Liu | 2017-07-25 | 3 | -3/+4 | |
| | | | | ||||||
| | * | | Fix makefile.am | Jisi Liu | 2017-07-25 | 3 | -0/+5 | |
| | | | | ||||||
| | * | | Fix conformance tests | Jisi Liu | 2017-07-25 | 2 | -4/+4 | |
| | | | | ||||||
| | * | | Fix build files | Jisi Liu | 2017-07-25 | 5 | -7/+3 | |
| | | | | ||||||
| | * | | Remove dependency on guava 20 | Jisi Liu | 2017-07-25 | 2 | -14/+10 | |
| | | | | ||||||
| | * | | Update conformance tests | Jisi Liu | 2017-07-25 | 3 | -5/+6 | |
| | | | | ||||||
| | * | | Merge remote-tracking branch 'origin/master' into merge | Jisi Liu | 2017-07-25 | 2 | -2/+3 | |
| | |\ \ | ||||||
| | * | | | Merge from master | Jisi Liu | 2017-07-25 | 87 | -1271/+3027 | |
| | | | | | ||||||
| * | | | | Merge pull request #3406 from ax3l/bg-3.4-cmake-pkgconfig | Feng Xiao | 2017-07-31 | 4 | -0/+30 | |
| |\ \ \ \ | | |/ / / | |/| | | | CMake: Install .pc Files (Backport: 3.4) | |||||
| | * | | | Travis: Exclude CMake .pc files | Axel Huebl | 2017-07-24 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude the unconfigured .pc input files of the CMake based install: they shall not be packed/distributed, only their outputs are | |||||
| | * | | | CMake: Install .pc Files | Axel Huebl | 2017-07-24 | 3 | -0/+29 | |
| | | | | | | | | | | | | | | | | | | | | Adds pkg-config (`.pc`) files for CMake based installs. | |||||
| * | | | | Merge pull request #3413 from pherl/3.4.x | Jisi Liu | 2017-07-25 | 24 | -42/+42 | |
| |\ \ \ \ | | | | | | | | | | | | | Update version number for 3.4.0 | |||||
| | * \ \ \ | Merge remote-tracking branch 'origin/3.4.x' into vb | Jisi Liu | 2017-07-24 | 3 | -23/+36 | |
| | |\ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | Merge pull request #3414 from pherl/fixzip | Jisi Liu | 2017-07-24 | 1 | -22/+32 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Omit the zip test if tools are not available | |||||
| | * | | | | | Omit the zip test if tools are not available | Jisi Liu | 2017-07-24 | 1 | -22/+32 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #3412 from anandolee/3.4.x | Jisi Liu | 2017-07-24 | 2 | -1/+4 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Use keys() instead of iterkeys() to be python3 compatbile. | |||||
| | * | | | | | Add __bool__ as well as __nonzero__ for python3 | Jie Luo | 2017-07-24 | 1 | -0/+3 | |
| | | | | | | | ||||||
| | * | | | | | Use keys() instead of iterkeys() to be python3 compatbile. | Jie Luo | 2017-07-24 | 1 | -1/+1 | |
| |/ / / / / | ||||||
| | * | | | | Update required version on pre-generated files | Jisi Liu | 2017-07-24 | 12 | -12/+12 | |
| | | | | | | ||||||
| | * | | | | Update pre generated files | Jisi Liu | 2017-07-24 | 12 | -12/+12 | |
| | | | | | | ||||||
| | * | | | | Update version number for 3.4.0 | Jisi Liu | 2017-07-24 | 12 | -18/+18 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #3393 from pherl/3.4.x | Jisi Liu | 2017-07-24 | 308 | -8120/+20323 | |
| |\ \ \ \ | | |/ / / | |/| | | | Create 3.4.x branch | |||||
| | * | | | Fix code to use values() instead | Jisi Liu | 2017-07-19 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Update filelist again | Jisi Liu | 2017-07-19 | 1 | -0/+1 | |
| | | | | | ||||||
| | * | | | Add lite and python extra_dist files | Jisi Liu | 2017-07-19 | 1 | -0/+4 | |
| | | | | | ||||||
| | * | | | Add java and JS dist files. | Jisi Liu | 2017-07-19 | 1 | -0/+23 | |
| | | | | | ||||||
| | * | | | remove broken imports in JS | Jisi Liu | 2017-07-19 | 1 | -2/+0 | |
| | | | | | ||||||
| | * | | | Use itmes() instead of itervalues() to be python3 compatbile. | Jisi Liu | 2017-07-19 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Fix distcheck | Jisi Liu | 2017-07-19 | 1 | -0/+1 | |
| | | | | | ||||||
| | * | | | remove profile | Jisi Liu | 2017-07-19 | 4 | -2239/+0 | |
| | | | | | ||||||
| | * | | | update build file list | Jisi Liu | 2017-07-19 | 2 | -3/+1 | |
| | | | | | ||||||
| | * | | | Update conformance tests | Jisi Liu | 2017-07-19 | 5 | -1184/+6 | |
| | | | | | ||||||
| | * | | | Merge master into 3.4.x | Jisi Liu | 2017-07-18 | 328 | -7456/+12078 | |
| | |\ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | Update csharp and php descriptor | Jisi Liu | 2017-07-18 | 8 | -188/+412 | |
| | | | | | ||||||
| | * | | | Merge from Google internal for 3.4 release | Jisi Liu | 2017-07-18 | 272 | -5810/+21087 | |
| | | | | | ||||||
* | | | | | Merge pull request #3317 from ejona86/protoc-artifacts-jdk8 | Jisi Liu | 2017-08-18 | 1 | -2/+3 | |
|\ \ \ \ \ | | | | | | | | | | | | | protoc-artifacts: Bump JDK to 8u131 | |||||
| * | | | | | protoc-artifacts: Bump JDK to 8u131 | Eric Anderson | 2017-07-05 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The update 45 download process no longer works, as it requires a login to access the old build. | |||||
* | | | | | | Revert "Drop Python 3.3 from testing & add Python 3.5, 3.6 (#3512)" (#3524) | Jie Luo | 2017-08-18 | 2 | -5/+4 | |
| | | | | | | | | | | | | | | | | | | This reverts commit 703f414ca6102e669ece2dcd5f7d9c2b05ca222e. | |||||
* | | | | | | Drop Python 3.3 from testing & add Python 3.5, 3.6 (#3512) | cclauss | 2017-08-18 | 2 | -4/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Drop Python 3.3 from testing & add Python 3.5, 3.6 Python 3.3 goes [EOL](https://docs.python.org/devguide/index.html#branchstatus) next month. * Sync test.sh with the Python versions in tox.ini | |||||
* | | | | | | Define cmp() for Python 3 (#3517) | cclauss | 2017-08-18 | 2 | -1/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Define cmp() for Python 3 http://python-future.org/compatible_idioms.html?highlight=cmp#cmp * Define cmp() for Python 3 http://python-future.org/compatible_idioms.html?highlight=cmp#cmp | |||||
* | | | | | | Merge pull request #3516 from cclauss/patch-3 | Jie Luo | 2017-08-18 | 6 | -32/+53 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Python 3 compatibility fixes: print(), long(), etc. | |||||
| * | | | | | | define long() for Python 3 | cclauss | 2017-08-18 | 1 | -5/+9 | |
| | | | | | | | ||||||
| * | | | | | | print() function for Python 3 | cclauss | 2017-08-18 | 1 | -10/+14 | |
| | | | | | | |