aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ObjC support for failing the build in the generated WKTs are out of dateThomas Van Lenten2016-04-202-31/+38
* Merge pull request #1426 from thomasvl/fix_comment_typoThomas Van Lenten2016-04-1921-20/+175
|\
| * Regenerate the WKT to pick up current changes to the proto files.Thomas Van Lenten2016-04-1920-5/+160
| * Fix comment typoThomas Van Lenten2016-04-191-15/+15
* | Merge pull request #1402 from davidzchen/py2and3Feng Xiao2016-04-191-3/+6
|\ \ | |/ |/|
| * Add missing PY2AND3 srcs_versions attributes to Python Bazel build targets.David Z. Chen2016-04-081-3/+6
* | Merge pull request #1422 from pherl/masterJisi Liu2016-04-182-1/+2
|\ \
| * | Update file list to include the missing extension lite file.Jisi Liu2016-04-182-1/+2
|/ /
* | Merge pull request #1413 from haberman/updateupbJoshua Haberman2016-04-159-1395/+1663
|\ \
| * | Bugfix for JSON error case.Josh Haberman2016-04-142-3/+1
| * | Remove no longer applicable documentation from README.md.Josh Haberman2016-04-141-68/+0
| * | Ruby JSON: always accept both camelCase and original field names.Josh Haberman2016-04-147-33/+82
| * | Documented the JSON change and compatibility flags.Josh Haberman2016-04-141-13/+83
| * | Updated upb: picked up legacy JSON flags to help Ruby users migrate.Josh Haberman2016-04-142-1354/+1573
|/ /
* | Merge pull request #1397 from google/internal-mergeJoshua Haberman2016-04-11273-4795/+34425
|\ \
| * | Fix for gulpfile.js.Josh Haberman2016-04-111-1/+10
| * | Removed duplicated operator delete from merge conflict.Josh Haberman2016-04-071-6/+0
| * | Merge branch 'master' into internal-mergeJosh Haberman2016-04-0742-124/+371
| |\ \
| * | | 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
| | |\ \ \ | | |/ / / | |/| | |
| | * | | 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
| | |\ \ \
| | * | | | Integrate google internal changes.Jisi Liu2016-03-30269-4802/+34402
* | | | | | Merge pull request #1400 from jskeet/fix-internalJan Tattermusch2016-04-101-1/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix to csharp_options - initialize internal_access to false.Jon Skeet2016-04-081-1/+2
|/ / / / /
* | | | | Merge pull request #1393 from gvaish/masterJon Skeet2016-04-073-1/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Added support for internal_access for C#Gaurav Vaish2016-04-073-1/+6
* | | | | 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
|/ / / / /