aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Get value from text format name in GPBEnumDescriptorDimitris Koutsogiorgas2016-06-263-0/+26
* Merge pull request #1522 from xfxyjwf/compatibility_noticeJisi Liu2016-05-121-30/+55
|\
| * Add compatibility notice for Java.Feng Xiao2016-05-111-30/+55
* | Merge pull request #1518 from jskeet/move_testJon Skeet2016-05-123-7/+19
|\ \
| * | Move test for standalone BoolValue to JsonParserTestJon Skeet2016-05-113-7/+19
* | | Merge pull request #1483 from wal-rus/fix-boost-incompatibilityFeng Xiao2016-05-111-3/+1
|\ \ \ | |/ / |/| |
| * | Remove confounding and unused #define - breaks boost/predef/other/endian.hWalter Gray2016-05-061-3/+1
* | | Merge pull request #1517 from jhickson/boolvalueJon Skeet2016-05-112-1/+9
|\ \ \ | |_|/ |/| |
| * | Fixed parsing of BoolValue.Jos Hickson2016-05-112-1/+9
| * | Merge remote-tracking branch 'refs/remotes/google/master'Jos Hickson2016-05-11566-16468/+52048
| |\ \ | |/ / |/| |
* | | Merge pull request #1510 from thomasvl/nonnullv3.0.0-beta-3-pre-1Thomas Van Lenten2016-05-102-65/+90
|\ \ \
| * | | Declare an init and avoid passing NULL to initWithValue:count:Thomas Van Lenten2016-05-102-65/+90
* | | | Merge pull request #1498 from thomasvl/build_cleanupJoshua Haberman2016-05-093-3/+110
|\ \ \ \ | |/ / / |/| | |
| * | | Add the missing maintiner-clean entry for benchmarksThomas Van Lenten2016-05-061-0/+3
| * | | Properly express all outputs for the conformance buildThomas Van Lenten2016-05-061-3/+105
| * | | Add two missing ignores for conformance directory.Thomas Van Lenten2016-05-061-0/+2
* | | | Merge pull request #1502 from pherl/masterJisi Liu2016-05-066-1492/+0
|\ \ \ \
| * | | | Remove accidentally restored deleted files.Jisi Liu2016-05-066-1492/+0
* | | | | Merge pull request #1494 from pherl/masterJisi Liu2016-05-065-6/+6
|\| | | |
| * | | | Fix using std::shared_ptrJisi Liu2016-05-055-5/+5
| * | | | Fix the std::string error introduced in integration.Jisi Liu2016-05-051-1/+1
* | | | | Merge pull request #1499 from beardedN5rd/masterFeng Xiao2016-05-061-1/+4
|\ \ \ \ \
| * | | | | after comment of Feng Xiao changed the entry to g++beardedn5rd2016-05-061-2/+2
| * | | | | updated READMEbeardedn5rd2016-05-061-1/+4
* | | | | | Merge pull request #1496 from ozkuran/masterFeng Xiao2016-05-061-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Updated README.mdMahmut Ali Ă–ZKURAN2016-05-061-1/+1
|/ / / / /
* | | | | Merge pull request #1471 from jskeet/any-hostJon Skeet2016-05-066-23/+88
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Allow custom type URL prefixes in Any.PackJon Skeet2016-04-296-23/+88
* | | | | Merge pull request #1409 from eeight/fix_enum_corruptionFeng Xiao2016-05-043-2/+50
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix bug with silent message corruption in LITE_RUNTIME.Petr Prokhorenkov2016-04-213-2/+50
* | | | | 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
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |