aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge 3.1.x into master.Bo Yang2016-10-131-9/+1
|\
| * Merge pull request #2203 from mrry/msvc_fixFeng Xiao2016-10-111-9/+1
| |\
| | * Fix MSVC build when HAVE_LONG_LONG is defined.Derek Murray2016-09-291-9/+1
| * | Merge pull request #2193 from acozzette/common-js-fixAdam Cozzette2016-10-041-14/+16
| |\ \
| | * | Fixed references to foreign nested messages with CommonJS-style importsAdam Cozzette2016-09-271-14/+16
| | |/
| * / Do strict enum name checking only for proto3Adam Cozzette2016-10-042-9/+27
| |/
| * Fix MSVC stack overflow issue.Feng Xiao2016-09-231-0/+5
| * Fix VS test failures.Feng Xiao2016-09-232-6/+24
| * Reduce test length to avoid stack overflow on VS.Feng Xiao2016-09-231-3/+3
| * Fix Visual Studio compile issues.Feng Xiao2016-09-2328-462/+748
| * Fix default instance destructorJisi Liu2016-09-2314-13/+112
| * Bump library version to 11Bo Yang2016-09-221-2/+2
| * Add back removed descriptor field.Bo Yang2016-09-223-137/+230
| * Fixed quadratic behavior in JSPB deserialization of repeated fields (#2117) (...Adam Cozzette2016-09-211-7/+3
| * Bump library veriosn to 3.1Bo Yang2016-09-2114-30/+30
| * Fix bugs for internal integration.Bo Yang2016-09-201-1/+1
| * Fix bugs for internal integration.Bo Yang2016-09-191-0/+1
| * Integrate internal changesBo Yang2016-09-19153-5232/+9444
* | Do strict enum name checking only for proto3Adam Cozzette2016-10-102-9/+27
* | Fixed references to foreign nested messages with CommonJS-style importsAdam Cozzette2016-10-101-14/+16
* | Fix MSVC stack overflow issue.Feng Xiao2016-10-101-0/+5
* | Fix VS test failures.Feng Xiao2016-10-102-6/+24
* | Reduce test length to avoid stack overflow on VS.Feng Xiao2016-10-101-3/+3
* | Fix Visual Studio compile issues.Feng Xiao2016-10-1028-462/+748
* | Fix default instance destructorJisi Liu2016-10-1014-13/+112
* | Bump library version to 11Bo Yang2016-10-101-2/+2
* | Add back removed descriptor field.Bo Yang2016-10-103-137/+230
* | Fixed quadratic behavior in JSPB deserialization of repeated fields (#2117) (...Adam Cozzette2016-10-101-7/+3
* | Bump library veriosn to 3.1Bo Yang2016-10-1014-30/+30
* | Fix bugs for internal integration.Bo Yang2016-10-101-1/+1
* | Fix bugs for internal integration.Bo Yang2016-10-101-0/+1
* | Integrate internal changesBo Yang2016-10-10153-5232/+9436
* | Silence compile warnings in bazelAndy Hochhaus2016-10-092-9/+17
* | Merge pull request #2192 from google/3.0.xJisi Liu2016-09-2713-13/+13
|\ \
| * | Update generated files.Jisi Liu2016-09-1412-12/+12
| * | Fix the version number for 3.0.2Jisi Liu2016-09-131-1/+1
* | | Fixes static analyzer issues from xcode.Sergio Campama2016-09-205-4/+7
| |/ |/|
* | Merge pull request #2112 from pherl/mergeJisi Liu2016-09-1528-8/+153
|\ \
| * | Merge remote-tracking branch 'origin/3.0.x' into mergeJisi Liu2016-09-1428-8/+153
| |\|
| | * Fix #2032 unused parameter 'deterministic'Khing2016-09-0813-0/+55
| | * Merge pull request #1862 from pherl/3.0.0-GAJisi Liu2016-09-023-14/+2
| | |\
| | | * Remove legacy_enum_values flag for GA.Jon Skeet2016-07-273-14/+2
| | * | Fixes extra whitespace on generated comments. (#1950)Sergio Campamá2016-08-171-2/+10
| | * | Adds support for appledoc in generated code. (#1928)Sergio Campamá2016-08-179-37/+74
| | * | Merge pull request #1905 from pherl/fixdocJisi Liu2016-08-0215-8/+98
| | |\ \
| | | * | Add and fix C++ runtime docsJisi Liu2016-08-0215-8/+98
| | | |/
* | | | Merge pull request #2123 from thomasvl/objc_better_versioning_take2Thomas Van Lenten2016-09-151-10/+14
|\ \ \ \
| * | | | Update the ObjC version checks to support a min and current version.Thomas Van Lenten2016-09-151-10/+14
| |/ / /
* / / / Check in php implementation. (#2052)Paul Yang2016-09-154-6/+844
|/ / /
* | | Merge pull request #2044 from wychen/Win32ANSIFeng Xiao2016-09-093-14/+19
|\ \ \