3354 Commits (2cd79bf3a8fd09c1df3dbc92a279a91a75896035)
 

Author SHA1 Message Date
Josh Haberman 2cd79bf3a8 Removed duplicated operator delete from merge conflict. 9 years ago
Josh Haberman 4465daa57a Merge branch 'master' into internal-merge 9 years ago
Josh Haberman 15239361e3 Fix for CommonJS tests. 9 years ago
Jie Luo 09292d5759 Merge pull request #1392 from anandolee/master 9 years ago
Jon Skeet cef46e115a Merge pull request #1390 from jskeet/tidy-up 9 years ago
Jie Luo c61207492e sync the Manually integrate changes in google3/third_party 9 years ago
Thomas Van Lenten 28c5c25397 Merge pull request #1391 from thomasvl/string_tweaks 9 years ago
Geoffrey Wiseman f98d2f5147 Updating Xcode Settings to use iOS 9.3 9 years ago
Jon Skeet 2a18bb5a33 Add more documentation for csharp_options.h 9 years ago
Jon Skeet bfd1c84a3d Line-wrapping changes only for C# generator code 9 years ago
Thomas Van Lenten c9167f2acd Error during parsing for invalid UTF-8 instead of dropping dropping data. 9 years ago
Thomas Van Lenten f3f5b3fb64 Add tests to ensure we read strings with BOMs so we don't forget about lessons of the past. 9 years ago
Jon Skeet 89719f07a3 Merge pull request #1349 from gvaish/master 9 years ago
Feng Xiao f3fe75bae5 Merge pull request #1386 from andrewharp/patch-2 9 years ago
Gaurav Vaish 74d8b0bebc Added access_level for types 9 years ago
Andrew Harp 3b4e7dcf29 Update BUILD 9 years ago
Andrew Harp b56b461e49 Do not link in pthread library for Android builds. 9 years ago
Thomas Van Lenten a771c9e11c Merge pull request #852 from qzix/master 9 years ago
Oleg Vereshko 268ce2818f Added deprecated option handling for objective-c generator 9 years ago
Jisi Liu aeacf51602 Merge pull request #1381 from pherl/internal-merge 9 years ago
Jisi Liu 7630a83767 Merge branch 'master' into internal-merge 9 years ago
Jisi Liu cba75ad404 Merge branch 'master' of github.com:google/protobuf 9 years ago
Jisi Liu 89343d87c6 Do not use C++11 unicode escape in unittest. 9 years ago
Joshua Haberman 452e2b2c5c Merge pull request #1353 from keveman/master 9 years ago
Manjunath Kudlur cf828deb9b Linking the cpp implementation extension statically with libprotobuf 9 years ago
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