3579 Commits (f180ef63985fb410dceda1e299020ee4ebd696e0)
 

Author SHA1 Message Date
Jisi Liu 93811ca9f7 Do not let windows.h define min/max macros 9 years ago
Jisi Liu 3b6df0612d Allow bigobj for map_unittest 9 years ago
Jon Skeet 9d7a1727e5 Merge pull request #1377 from jskeet/remove-duplicate-tests 9 years ago
Thomas Van Lenten a293180541 Merge pull request #1378 from thomasvl/manual_stream_parsing_helpers 9 years ago
Thomas Van Lenten 331cee5022 Add -position and -isAtEnd for use when manually parsing input streams. 9 years ago
Jon Skeet 46e088e2b6 Remove duplicate test cases. 9 years ago
Jan Tattermusch 099ff1ea14 Merge pull request #1369 from jskeet/tools-nuspec 9 years ago
Jisi Liu 203bb5eb33 Fix re-definition issue of winsock.h and winsock2.h 9 years ago
Jisi Liu 1bf446c71e Disable sign-compare warning. 9 years ago
Jisi Liu 7b1cbbd50e Fix signed-compare warning. 9 years ago
Jisi Liu 012ac9a0a6 revert unexpected change for py26 9 years ago
Jisi Liu bc1f2e7e6e Fix WIN32 build for map_test. 9 years ago
Jisi Liu cbfd9d43c8 Remove export macros for classes nested in a template class. 9 years ago
Joshua Haberman 81eb84c029 Merge pull request #1371 from keveman/oversize_protos 9 years ago
Manjunath Kudlur 1283625b0f Added an API to allow oversize protos when using C++ extension in Python 9 years ago
Jisi Liu 5805c2dfb7 Fix javanano package 9 years ago
Jisi Liu fc7eeda69c Fix json_format.py in py26 9 years ago
Feng Xiao 5c63266ed3 Merge pull request #1366 from xyzzyz/int128_ostream 9 years ago
Jisi Liu 94aa50ffd6 Fix breakage of referring to table_ in static func 9 years ago
Jisi Liu 9e7fa0678d Temporarily disable begin is fast test. 9 years ago
Jon Skeet dfd47600d1 Remove duplicate line 9 years ago
Jon Skeet ca0461c186 Introduce a new nuget package, Google.Protobuf.Tools, basically to contain protoc on multiple platforms. 9 years ago
Jan Tattermusch a16c8a50f0 Merge pull request #1362 from jskeet/tweak_json_name 9 years ago
Adam Michalik 955841e620 Replace #include <iostream> with #include <ostream> 9 years ago
Jisi Liu 0de06f54bc Merge branch 'master' of github.com:google/protobuf 9 years ago
Jisi Liu 3b3c8abb96 Integrate google internal changes. 9 years ago
Jisi Liu a25e9964b1 Merge pull request #1360 from pherl/master 9 years ago
Joshua Haberman 34d0cc220b Merge pull request #1295 from haberman/docker 9 years ago
Jon Skeet 71e8dca083 Refactoring of FieldDescriptor 9 years ago
Jon Skeet 261fde1707 Merge pull request #1326 from the-alien/csharp_json_name 9 years ago
Josh Haberman a15b916c41 Merge branch 'master' into docker 9 years ago
Jisi Liu e164f1083f Use the T() instead of NULL for the default value. 9 years ago
alien af34538aca Merge branch 'master' of https://github.com/google/protobuf into csharp_json_name 9 years ago
alien 6f8dd2115b Code review fixes 9 years ago
Thomas Van Lenten 261ee021f6 Merge pull request #1358 from thomasvl/travis_tweaks 9 years ago
Thomas Van Lenten 8d47d7873e Mark iOS tests as able to fail. 9 years ago
Thomas Van Lenten 9240acd179 Merge pull request #1350 from thomasvl/over_release 9 years ago
Thomas Van Lenten 3f917447e7 The message was autoreleased, the -releases are an over release. 9 years ago
Feng Xiao 812691227d Merge pull request #1345 from smparkes/smparkes/well-known-protos 9 years ago
Steven Parkes d5a573274d export well known protos 9 years ago
Feng Xiao 34eeeff640 Merge pull request #1344 from topillar/patch-1 9 years ago
topillar 64dfb5f80a Update coded_stream.h 9 years ago
Feng Xiao 698fa8ee22 Merge pull request #1335 from pradeepg26/master 9 years ago
Thomas Van Lenten 92091363cd Merge pull request #1339 from thomasvl/delay_dispatch_semaphore_creation 9 years ago
Thomas Van Lenten bd41a39f69 Only create the readonlySemaphore on demand. 9 years ago
Pradeep Gollakota 4d98369f6d Allow custom URLs for Any in JsonFormat 9 years ago
alien 0d32ab37fa csharp: add support for the json_name option 9 years ago
Thomas Van Lenten 5e933847cc Merge pull request #1325 from thomasvl/shrink_overhead 9 years ago
Thomas Van Lenten 79a23c435c Shrink ObjC overhead (generated size and some runtime sizes) 9 years ago
Feng Xiao ca3dc15d4c Merge pull request #1318 from smparkes/smparkes/grpc 9 years ago