aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Merge branch 'master' into internal-mergeGravatar Josh Haberman2016-04-07
|\
* | Fix for CommonJS tests.Gravatar Josh Haberman2016-04-07
| * Merge pull request #1392 from anandolee/masterGravatar Jie Luo2016-04-07
| |\
| * \ Merge pull request #1390 from jskeet/tidy-upGravatar Jon Skeet2016-04-07
| |\ \
| | | * sync the Manually integrate changes in google3/third_partyGravatar Jie Luo2016-04-06
| * | | Merge pull request #1391 from thomasvl/string_tweaksGravatar Thomas Van Lenten2016-04-06
| |\ \ \
| * | | | Updating Xcode Settings to use iOS 9.3Gravatar Geoffrey Wiseman2016-04-06
| | | * | Add more documentation for csharp_options.hGravatar Jon Skeet2016-04-06
| | | * | Line-wrapping changes only for C# generator codeGravatar Jon Skeet2016-04-06
| | |/ / | |/| |
| | * | Error during parsing for invalid UTF-8 instead of dropping dropping data.Gravatar Thomas Van Lenten2016-04-05
| | * | Add tests to ensure we read strings with BOMs so we don't forget about lesson...Gravatar Thomas Van Lenten2016-04-05
| |/ /
| * | Merge pull request #1349 from gvaish/masterGravatar Jon Skeet2016-04-05
| |\ \
| * \ \ Merge pull request #1386 from andrewharp/patch-2Gravatar Feng Xiao2016-04-05
| |\ \ \
| | | * | Added access_level for typesGravatar Gaurav Vaish2016-04-05
| | * | | Update BUILDGravatar Andrew Harp2016-04-04
| | * | | Do not link in pthread library for Android builds.Gravatar Andrew Harp2016-04-04
| |/ / /
| * | | Merge pull request #852 from qzix/masterGravatar Thomas Van Lenten2016-04-04
| |\ \ \ | | |/ / | |/| |
| | * | Added deprecated option handling for objective-c generatorGravatar Oleg Vereshko2016-04-04
* | | | Merge pull request #1381 from pherl/internal-mergeGravatar Jisi Liu2016-04-01
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into internal-mergeGravatar Jisi Liu2016-04-01
|/| | |
| * | | Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2016-04-01
| |\ \ \ | |/ / / |/| | |
| * | | Do not use C++11 unicode escape in unittest.Gravatar Jisi Liu2016-04-01
* | | | Merge pull request #1353 from keveman/masterGravatar Joshua Haberman2016-04-01
|\ \ \ \
| * | | | Linking the cpp implementation extension statically with libprotobufGravatar Manjunath Kudlur2016-04-01
| | * | | Do not let windows.h define min/max macrosGravatar Jisi Liu2016-04-01
| | * | | Allow bigobj for map_unittestGravatar Jisi Liu2016-04-01
* | | | | Merge pull request #1377 from jskeet/remove-duplicate-testsGravatar Jon Skeet2016-04-01
|\ \ \ \ \
* \ \ \ \ \ Merge pull request #1378 from thomasvl/manual_stream_parsing_helpersGravatar Thomas Van Lenten2016-04-01
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add -position and -isAtEnd for use when manually parsing input streams.Gravatar Thomas Van Lenten2016-04-01
|/ / / / /
| * / / / Remove duplicate test cases.Gravatar Jon Skeet2016-04-01
|/ / / /
* | | | Merge pull request #1369 from jskeet/tools-nuspecGravatar Jan Tattermusch2016-03-31
|\ \ \ \ | |/ / / |/| | |
| | * | Fix re-definition issue of winsock.h and winsock2.hGravatar Jisi Liu2016-03-31
| | * | Disable sign-compare warning.Gravatar Jisi Liu2016-03-31
| | * | Fix signed-compare warning.Gravatar Jisi Liu2016-03-31
| | * | revert unexpected change for py26Gravatar Jisi Liu2016-03-31
| | * | Fix WIN32 build for map_test.Gravatar Jisi Liu2016-03-31
| | * | Remove export macros for classes nested in a template class.Gravatar Jisi Liu2016-03-31
* | | | Merge pull request #1371 from keveman/oversize_protosGravatar Joshua Haberman2016-03-31
|\ \ \ \
| * | | | Added an API to allow oversize protos when using C++ extension in PythonGravatar Manjunath Kudlur2016-03-31
| | | * | Fix javanano packageGravatar Jisi Liu2016-03-31
| | | * | Fix json_format.py in py26Gravatar Jisi Liu2016-03-31
* | | | | Merge pull request #1366 from xyzzyz/int128_ostreamGravatar Feng Xiao2016-03-31
|\ \ \ \ \ | |/ / / / |/| | | |
| | | * | Fix breakage of referring to table_ in static funcGravatar Jisi Liu2016-03-31
| | | * | Temporarily disable begin is fast test.Gravatar Jisi Liu2016-03-31
| | * | | Remove duplicate lineGravatar Jon Skeet2016-03-31
| | * | | Introduce a new nuget package, Google.Protobuf.Tools, basically to contain pr...Gravatar Jon Skeet2016-03-31
* | | | | Merge pull request #1362 from jskeet/tweak_json_nameGravatar Jan Tattermusch2016-03-30
|\ \ \ \ \
| | * | | | Replace #include <iostream> with #include <ostream>Gravatar Adam Michalik2016-03-30
| |/ / / / |/| | | |
| | | * | Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2016-03-30
| | | |\ \ | |_|_|/ / |/| | | |
| | | * | Integrate google internal changes.Gravatar Jisi Liu2016-03-30