4167 Commits (130bb0739a229a478d292e903b1b3ce6b1fb2494)
 

Author SHA1 Message Date
Jie Luo e1f588ae3c Merge pull request #1 from google/beta-3 9 years ago
Jisi Liu 71dd9c4a5e Merge pull request #1515 from pherl/changelog-beta3 9 years ago
Jisi Liu ede9cc4bd5 Update comments for csharp, zero-copy and objc. 9 years ago
Jisi Liu 19472bf5cb Merge pull request #1512 from pherl/beta-3 9 years ago
Jisi Liu 017d390d65 Fix csharp version 9 years ago
Jisi Liu dbdf6d9085 Bridge vs2008 hashmaps. 9 years ago
Jisi Liu 5668e2e426 Fix typo. 9 years ago
Feng Xiao 920ee735cf Merge pull request #1483 from wal-rus/fix-boost-incompatibility 9 years ago
Jon Skeet 7cc9cb407b Move test for standalone BoolValue to JsonParserTest 9 years ago
Jon Skeet cca2d44ef1 Merge pull request #1517 from jhickson/boolvalue 9 years ago
Jos Hickson 835fb947cc Fixed parsing of BoolValue. 9 years ago
Jos Hickson 2b22b611a8 Merge remote-tracking branch 'refs/remotes/google/master' 9 years ago
Jisi Liu c67879b9fa Merge pull request #1514 from pherl/fix_heap_check 9 years ago
Jisi Liu 0e4d1ea116 Initial draft for changelog. 9 years ago
Jisi Liu e8737d8676 Fix the command line interface unittest again 9 years ago
Jisi Liu cdd3ec7c2f Merge pull request #1513 from pherl/fix-build-protoc 9 years ago
Jisi Liu 25dd69002f Fix protoc build artifact script. 9 years ago
Jisi Liu 5dea2017db Update version numbers for other languages 9 years ago
Jisi Liu dbed8a0154 Update version numbers for beta3 9 years ago
Thomas Van Lenten a1938b2aa9 Merge pull request #1510 from thomasvl/nonnull 9 years ago
Thomas Van Lenten 4755bdc5f9 Declare an init and avoid passing NULL to initWithValue:count: 9 years ago
Joshua Haberman 4c6259bbe8 Merge pull request #1498 from thomasvl/build_cleanup 9 years ago
Walter Gray f4bc9e0ddb Remove confounding and unused #define - breaks boost/predef/other/endian.h 9 years ago
Jisi Liu d392ed4577 Merge pull request #1502 from pherl/master 9 years ago
Jisi Liu ce6bec74fd Remove accidentally restored deleted files. 9 years ago
Jisi Liu 9d0f56058a Merge pull request #1494 from pherl/master 9 years ago
Feng Xiao 76a96d4690 Merge pull request #1499 from beardedN5rd/master 9 years ago
beardedn5rd 2eb774e602 after comment of Feng Xiao changed the entry to g++ 9 years ago
Feng Xiao ace2690be1 Merge pull request #1496 from ozkuran/master 9 years ago
Thomas Van Lenten b661fb5000 Add the missing maintiner-clean entry for benchmarks 9 years ago
Thomas Van Lenten ce2ef0d705 Properly express all outputs for the conformance build 9 years ago
Thomas Van Lenten f367642103 Add two missing ignores for conformance directory. 9 years ago
beardedn5rd b12f630e81 updated README 9 years ago
Mahmut Ali ÖZKURAN 9b3357ddac Updated README.md 9 years ago
Jon Skeet 5b5e369b18 Merge pull request #1471 from jskeet/any-host 9 years ago
Jisi Liu f8a5c5f746 Fix using std::shared_ptr 9 years ago
Jisi Liu 75e5898513 Fix the std::string error introduced in integration. 9 years ago
Feng Xiao 17b6fc31eb Merge pull request #1409 from eeight/fix_enum_corruption 9 years ago
Joshua Haberman 72e162ce96 Merge pull request #1482 from nicolasnoble/rake-tweaks-2 9 years ago
Nicolas "Pixel" Noble edd29498f4 Properly generating well known proto files for the macos build. 9 years ago
Joshua Haberman 07bcf21a9c Merge pull request #1464 from google/benchmarks 9 years ago
Joshua Haberman 7dda312224 Merge pull request #1473 from nicolasnoble/rake-tweaks 9 years ago
Josh Haberman 247ef1f0df Addressed PR comments. 9 years ago
Jisi Liu 09f1757cf5 Merge pull request #1467 from pherl/master 9 years ago
Nicolas "Pixel" Noble 236b93937f Addressing concerns. 9 years ago
Jisi Liu e0df23ac14 Update descritpor protos for objc 9 years ago
Thomas Van Lenten aed7b345fa Merge pull request #1474 from pherl/fixscript 9 years ago
Jisi Liu 454d5be8d3 Merge the script fix. 9 years ago
Jisi Liu cf7e99db96 Fix cp -r usage to be portable. 9 years ago
Nicolas "Pixel" Noble 1f8b6da920 Few tweaks to the rakefile to permit native gems compilation with the proto files generation. 9 years ago