Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update version numbers for other languages | Jisi Liu | 2016-05-10 | 8 | -10/+10 |
* | Update version numbers for beta3 | Jisi Liu | 2016-05-10 | 3 | -3/+3 |
* | Merge pull request #1510 from thomasvl/nonnullv3.0.0-beta-3-pre-1 | Thomas Van Lenten | 2016-05-10 | 2 | -65/+90 |
|\ | |||||
| * | Declare an init and avoid passing NULL to initWithValue:count: | Thomas Van Lenten | 2016-05-10 | 2 | -65/+90 |
* | | Merge pull request #1498 from thomasvl/build_cleanup | Joshua Haberman | 2016-05-09 | 3 | -3/+110 |
|\ \ | |/ |/| | |||||
| * | Add the missing maintiner-clean entry for benchmarks | Thomas Van Lenten | 2016-05-06 | 1 | -0/+3 |
| * | Properly express all outputs for the conformance build | Thomas Van Lenten | 2016-05-06 | 1 | -3/+105 |
| * | Add two missing ignores for conformance directory. | Thomas Van Lenten | 2016-05-06 | 1 | -0/+2 |
* | | Merge pull request #1502 from pherl/master | Jisi Liu | 2016-05-06 | 6 | -1492/+0 |
|\ \ | |||||
| * | | Remove accidentally restored deleted files. | Jisi Liu | 2016-05-06 | 6 | -1492/+0 |
* | | | Merge pull request #1494 from pherl/master | Jisi Liu | 2016-05-06 | 5 | -6/+6 |
|\| | | |||||
| * | | Fix using std::shared_ptr | Jisi Liu | 2016-05-05 | 5 | -5/+5 |
| * | | Fix the std::string error introduced in integration. | Jisi Liu | 2016-05-05 | 1 | -1/+1 |
* | | | Merge pull request #1499 from beardedN5rd/master | Feng Xiao | 2016-05-06 | 1 | -1/+4 |
|\ \ \ | |||||
| * | | | after comment of Feng Xiao changed the entry to g++ | beardedn5rd | 2016-05-06 | 1 | -2/+2 |
| * | | | updated README | beardedn5rd | 2016-05-06 | 1 | -1/+4 |
* | | | | Merge pull request #1496 from ozkuran/master | Feng Xiao | 2016-05-06 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Updated README.md | Mahmut Ali Ă–ZKURAN | 2016-05-06 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #1471 from jskeet/any-host | Jon Skeet | 2016-05-06 | 6 | -23/+88 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Allow custom type URL prefixes in Any.Pack | Jon Skeet | 2016-04-29 | 6 | -23/+88 |
* | | | Merge pull request #1409 from eeight/fix_enum_corruption | Feng Xiao | 2016-05-04 | 3 | -2/+50 |
|\ \ \ | |||||
| * | | | Fix bug with silent message corruption in LITE_RUNTIME. | Petr Prokhorenkov | 2016-04-21 | 3 | -2/+50 |
* | | | | Merge pull request #1482 from nicolasnoble/rake-tweaks-2 | Joshua Haberman | 2016-05-03 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Properly generating well known proto files for the macos build. | Nicolas "Pixel" Noble | 2016-05-04 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge pull request #1464 from google/benchmarks | Joshua Haberman | 2016-05-03 | 9 | -10/+370 |
|\ \ \ \ | |||||
| * | | | | Addressed PR comments. | Josh Haberman | 2016-05-03 | 4 | -55/+9 |
| * | | | | Fixed for pre-C++11 ifstream which does not accept std::string. | Josh Haberman | 2016-04-29 | 1 | -2/+2 |
| * | | | | Read files directly from filesystem since xxd isn't always available. | Josh Haberman | 2016-04-29 | 3 | -17/+15 |
| * | | | | Make the C++ tests build the benchmarking code. | Josh Haberman | 2016-04-29 | 1 | -0/+3 |
| * | | | | Updates for PR comments. | Josh Haberman | 2016-04-29 | 2 | -5/+6 |
| * | | | | Added README describing the directory. | Josh Haberman | 2016-04-27 | 2 | -3/+33 |
| * | | | | Added framework for generating/consuming benchmarking data sets. | Josh Haberman | 2016-04-27 | 7 | -10/+384 |
* | | | | | Merge pull request #1473 from nicolasnoble/rake-tweaks | Joshua Haberman | 2016-05-03 | 3 | -31/+43 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Addressing concerns. | Nicolas "Pixel" Noble | 2016-04-30 | 1 | -1/+9 |
| * | | | | Few tweaks to the rakefile to permit native gems compilation with the proto f... | Nicolas "Pixel" Noble | 2016-04-29 | 3 | -32/+36 |
* | | | | | Merge pull request #1467 from pherl/master | Jisi Liu | 2016-04-30 | 213 | -3836/+10987 |
|\ \ \ \ \ | |||||
| * | | | | | Update descritpor protos for objc | Jisi Liu | 2016-04-29 | 22 | -3863/+3 |
| * | | | | | Merge the script fix. | Jisi Liu | 2016-04-29 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * | | | | | | Update file lists. | Jisi Liu | 2016-04-28 | 2 | -1/+6 |
| * | | | | | | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2016-04-28 | 25 | -1234/+3354 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Down integrate from Google internal. | Jisi Liu | 2016-04-28 | 228 | -3859/+14739 |
* | | | | | | | Merge pull request #1474 from pherl/fixscript | Thomas Van Lenten | 2016-04-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | | |||||
| * | | | | | Fix cp -r usage to be portable. | Jisi Liu | 2016-04-29 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #1462 from acozzette/ruby-2.3 | Adam Cozzette | 2016-04-28 | 1 | -2/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Added dig and bsearch_index to RepeatedField methods forwarded to array | Adam Cozzette | 2016-04-27 | 1 | -2/+2 |
* | | | | | Merge pull request #1461 from thomasvl/fix_bool_handing | Thomas Van Lenten | 2016-04-27 | 3 | -5/+114 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Fix up -hash/-isEqual: for bool storage. | Thomas Van Lenten | 2016-04-27 | 3 | -5/+114 |
| |/ / / | |||||
* | | | | Merge pull request #1455 from haberman/updateupb | Joshua Haberman | 2016-04-27 | 4 | -1222/+1552 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Updated upb and simplified ruby code a bit with new upb method. | Josh Haberman | 2016-04-22 | 4 | -1222/+1552 |
* | | | | Merge pull request #1454 from thomasvl/enum_defaults | Thomas Van Lenten | 2016-04-26 | 3 | -4/+22 |
|\ \ \ \ | |/ / / |/| | | |