aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into internal-mergeJosh Haberman2016-04-0742-124/+371
|\
| * Merge pull request #1392 from anandolee/masterJie Luo2016-04-078-19/+41
| |\
| | * sync the Manually integrate changes in google3/third_partyJie Luo2016-04-068-19/+41
| * | Merge pull request #1390 from jskeet/tidy-upJon Skeet2016-04-0721-49/+111
| |\ \
| | * | Add more documentation for csharp_options.hJon Skeet2016-04-062-6/+18
| | * | Line-wrapping changes only for C# generator codeJon Skeet2016-04-0620-44/+94
| * | | Merge pull request #1391 from thomasvl/string_tweaksThomas Van Lenten2016-04-062-9/+47
| |\ \ \
| | * | | Error during parsing for invalid UTF-8 instead of dropping dropping data.Thomas Van Lenten2016-04-052-9/+9
| | * | | Add tests to ensure we read strings with BOMs so we don't forget about lesson...Thomas Van Lenten2016-04-051-0/+38
| | |/ /
| * / / Updating Xcode Settings to use iOS 9.3Geoffrey Wiseman2016-04-061-0/+8
| |/ /
| * | Merge pull request #1349 from gvaish/masterJon Skeet2016-04-0532-84/+177
| |\ \
| | * | Added access_level for typesGaurav Vaish2016-04-0532-84/+177
| * | | Merge pull request #1386 from andrewharp/patch-2Feng Xiao2016-04-051-2/+12
| |\ \ \
| | * | | Update BUILDAndrew Harp2016-04-041-1/+1
| | * | | Do not link in pthread library for Android builds.Andrew Harp2016-04-041-2/+12
| |/ / /
| * | | Merge pull request #852 from qzix/masterThomas Van Lenten2016-04-045-11/+41
| |\ \ \ | | |/ / | |/| |
| | * | Added deprecated option handling for objective-c generatorOleg Vereshko2016-04-045-11/+41
* | | | Fix for CommonJS tests.Josh Haberman2016-04-072-8/+30
* | | | Merge pull request #1381 from pherl/internal-mergeJisi Liu2016-04-01270-4796/+34417
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into internal-mergeJisi Liu2016-04-01270-4796/+34417
|/| | |
| * | | Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-0112-106/+218
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1353 from keveman/masterJoshua Haberman2016-04-012-17/+30
|\ \ \ \
| * | | | Linking the cpp implementation extension statically with libprotobufManjunath Kudlur2016-04-012-17/+30
* | | | | Merge pull request #1377 from jskeet/remove-duplicate-testsJon Skeet2016-04-012-2/+0
|\ \ \ \ \
| * | | | | Remove duplicate test cases.Jon Skeet2016-04-012-2/+0
| | |_|/ / | |/| | |
* | | | | Merge pull request #1378 from thomasvl/manual_stream_parsing_helpersThomas Van Lenten2016-04-012-0/+17
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add -position and -isAtEnd for use when manually parsing input streams.Thomas Van Lenten2016-04-012-0/+17
|/ / / /
* | | | Merge pull request #1369 from jskeet/tools-nuspecJan Tattermusch2016-03-312-14/+37
|\ \ \ \ | |/ / / |/| | |
| * | | Remove duplicate lineJon Skeet2016-03-311-1/+0
| * | | Introduce a new nuget package, Google.Protobuf.Tools, basically to contain pr...Jon Skeet2016-03-312-14/+38
* | | | Merge pull request #1371 from keveman/oversize_protosJoshua Haberman2016-03-312-11/+94
|\ \ \ \
| * | | | Added an API to allow oversize protos when using C++ extension in PythonManjunath Kudlur2016-03-312-11/+94
* | | | | Merge pull request #1366 from xyzzyz/int128_ostreamFeng Xiao2016-03-311-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Replace #include <iostream> with #include <ostream>Adam Michalik2016-03-301-1/+1
* | | | | Merge pull request #1362 from jskeet/tweak_json_nameJan Tattermusch2016-03-301-61/+39
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Refactoring of FieldDescriptorJon Skeet2016-03-301-61/+39
| |/ / /
| | * | Do not use C++11 unicode escape in unittest.Jisi Liu2016-04-011-1/+1
| | * | Do not let windows.h define min/max macrosJisi Liu2016-04-011-0/+1
| | * | Allow bigobj for map_unittestJisi Liu2016-04-011-0/+2
| | * | Fix re-definition issue of winsock.h and winsock2.hJisi Liu2016-03-311-0/+1
| | * | Disable sign-compare warning.Jisi Liu2016-03-311-1/+3
| | * | Fix signed-compare warning.Jisi Liu2016-03-311-1/+1
| | * | revert unexpected change for py26Jisi Liu2016-03-311-1/+4
| | * | Fix WIN32 build for map_test.Jisi Liu2016-03-311-0/+6
| | * | Remove export macros for classes nested in a template class.Jisi Liu2016-03-311-3/+3
| | * | Fix javanano packageJisi Liu2016-03-311-0/+3
| | * | Fix json_format.py in py26Jisi Liu2016-03-311-2/+4
| | * | Fix breakage of referring to table_ in static funcJisi Liu2016-03-311-1/+1
| | * | Temporarily disable begin is fast test.Jisi Liu2016-03-311-1/+2
| | * | Merge branch 'master' of github.com:google/protobufJisi Liu2016-03-30114-6935/+4729
| | |\ \ | |_|/ / |/| | |