aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove confounding and unused #define - breaks boost/predef/other/endian.hWalter Gray2016-05-061-3/+1
* Merge pull request #1482 from nicolasnoble/rake-tweaks-2Joshua Haberman2016-05-031-0/+1
|\
| * Properly generating well known proto files for the macos build.Nicolas "Pixel" Noble2016-05-041-0/+1
|/
* Merge pull request #1464 from google/benchmarksJoshua Haberman2016-05-039-10/+370
|\
| * Addressed PR comments.Josh Haberman2016-05-034-55/+9
| * Fixed for pre-C++11 ifstream which does not accept std::string.Josh Haberman2016-04-291-2/+2
| * Read files directly from filesystem since xxd isn't always available.Josh Haberman2016-04-293-17/+15
| * Make the C++ tests build the benchmarking code.Josh Haberman2016-04-291-0/+3
| * Updates for PR comments.Josh Haberman2016-04-292-5/+6
| * Added README describing the directory.Josh Haberman2016-04-272-3/+33
| * Added framework for generating/consuming benchmarking data sets.Josh Haberman2016-04-277-10/+384
* | Merge pull request #1473 from nicolasnoble/rake-tweaksJoshua Haberman2016-05-033-31/+43
|\ \
| * | Addressing concerns.Nicolas "Pixel" Noble2016-04-301-1/+9
| * | Few tweaks to the rakefile to permit native gems compilation with the proto f...Nicolas "Pixel" Noble2016-04-293-32/+36
* | | Merge pull request #1467 from pherl/masterJisi Liu2016-04-30213-3836/+10987
|\ \ \
| * | | Update descritpor protos for objcJisi Liu2016-04-2922-3863/+3
| * | | Merge the script fix.Jisi Liu2016-04-291-1/+1
| |\ \ \
| * | | | Update file lists.Jisi Liu2016-04-282-1/+6
| * | | | Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-2825-1234/+3354
| |\ \ \ \
| * | | | | Down integrate from Google internal.Jisi Liu2016-04-28228-3859/+14739
* | | | | | Merge pull request #1474 from pherl/fixscriptThomas Van Lenten2016-04-291-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Fix cp -r usage to be portable.Jisi Liu2016-04-291-1/+1
|/ / / /
* | | | Merge pull request #1462 from acozzette/ruby-2.3Adam Cozzette2016-04-281-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Added dig and bsearch_index to RepeatedField methods forwarded to arrayAdam Cozzette2016-04-271-2/+2
* | | | Merge pull request #1461 from thomasvl/fix_bool_handingThomas Van Lenten2016-04-273-5/+114
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix up -hash/-isEqual: for bool storage.Thomas Van Lenten2016-04-273-5/+114
| |/ /
* | | Merge pull request #1455 from haberman/updateupbJoshua Haberman2016-04-274-1222/+1552
|\ \ \ | |/ / |/| |
| * | Updated upb and simplified ruby code a bit with new upb method.Josh Haberman2016-04-224-1222/+1552
* | | Merge pull request #1454 from thomasvl/enum_defaultsThomas Van Lenten2016-04-263-4/+22
|\ \ \ | |/ / |/| |
| * | Proper checking of enum with non zero defaultThomas Van Lenten2016-04-263-4/+22
|/ /
* | Merge pull request #1444 from mbrtargeting/masterFeng Xiao2016-04-221-0/+2
|\ \
| * | Added serialVersionUID to ExtendableMessage.Jakub Kukul2016-04-221-0/+2
* | | Add initial design document for Swift protocol buffers. (#1442)Tony Allevato2016-04-221-0/+674
|/ /
* | Merge pull request #1438 from xfxyjwf/docsFeng Xiao2016-04-211-0/+147
|\ \
| * | Add a docs directory and move the third-party add-ons page here.Feng Xiao2016-04-201-0/+147
* | | Merge pull request #1416 from cwhipkey/masterFeng Xiao2016-04-209-29/+743
|\ \ \ | |_|/ |/| |
| * | Change protobuf CPP proto generator to support the 'lite' option inChad Whipkey2016-04-159-29/+743
* | | Merge pull request #1414 from xyzzyz/googletestFeng Xiao2016-04-201-1/+0
|\ \ \
| * | | Remove googletest.h header from stringprintf.ccAdam Michalik2016-04-141-1/+0
* | | | Merge pull request #1434 from jskeet/regenerateThomas Van Lenten2016-04-208-103/+130
|\ \ \ \
| * | | | Regenerate well-known types for C#Jon Skeet2016-04-208-103/+130
|/ / / /
* | | | Merge pull request #1433 from thomasvl/check_wktThomas Van Lenten2016-04-202-31/+38
|\ \ \ \
| * | | | ObjC support for failing the build in the generated WKTs are out of dateThomas Van Lenten2016-04-202-31/+38
* | | | | Merge pull request #1401 from jskeet/enum-casingJon Skeet2016-04-2034-294/+542
|\ \ \ \ \
| * | | | | Attempt to fix AppVeyor build by exporting GetEnumValueNameJon Skeet2016-04-202-1/+9
| * | | | | Use the original name in JSON formatting.Jon Skeet2016-04-202-2/+45
| * | | | | Regenerate all C# code and make it compileJon Skeet2016-04-2022-285/+285
| * | | | | Add C# codegen changes to enum value names (mostly C++)Jon Skeet2016-04-209-6/+201
| * | | | | Use 0 as the default value for all enums, rather than finding the actual enum...Jon Skeet2016-04-111-1/+3
* | | | | | Merge pull request #1417 from seishun/windows2Joshua Haberman2016-04-192-2/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |