aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1093 from thomasvl/fix_objcThomas Van Lenten2016-01-051-0/+13
|\
| * Update objectivec/google/protobuf/Type.pbobjc.mThomas Van Lenten2016-01-051-0/+13
|/
* Merge pull request #1092 from thomasvl/fix_conformanceThomas Van Lenten2016-01-051-3/+0
|\
| * Fix conformance test to only report skips in verbose mode.Thomas Van Lenten2016-01-051-3/+0
|/
* Merge pull request #1091 from thomasvl/objc_tests_use_autocreatorsThomas Van Lenten2016-01-054-13/+1
|\
| * Have the tests rely on the autocreator behaviors.Thomas Van Lenten2016-01-054-13/+1
|/
* Merge pull request #1085 from jskeet/fix-generationJon Skeet2016-01-052-125/+1301
|\
| * Fix C# source generation shell script and remove out of date notesJon Skeet2016-01-042-125/+1301
|/
* Merge pull request #1081 from haberman/fix-py3Joshua Haberman2015-12-313-91/+152
|\
| * Fixed compile for Python 3. There are still some crashes though.Josh Haberman2015-12-303-91/+152
|/
* Add changelog for v3.0.0-beta-2.v3.0.0-beta-2Feng Xiao2015-12-301-0/+61
* Fix for Visual Studio 2008.Feng Xiao2015-12-304-35/+27
* Require six>=1.9 for Python.Feng Xiao2015-12-292-2/+2
* Update BUILD/cmake files.Feng Xiao2015-12-283-3/+9
* Fix a misplaced macro.Feng Xiao2015-12-281-5/+5
* Add js to post_process_dist.sh.Feng Xiao2015-12-281-1/+1
* Fix a compiler warning.Feng Xiao2015-12-281-0/+2
* Add missing files to EXTRA_DIST.Feng Xiao2015-12-2810-279/+83
* Merge pull request #1071 from haberman/js-testsFeng Xiao2015-12-288-1/+135
|\
| * Fixed test command for JS tests.Josh Haberman2015-12-281-1/+1
| * Fixed version number and testing command.Josh Haberman2015-12-221-2/+2
| * Added README and enabled JavaScript tests on Node.jsJosh Haberman2015-12-218-1/+135
|/
* Disable python conformnace tests as well.Feng Xiao2015-12-211-2/+4
* Fix Python 2.6 test failures.Feng Xiao2015-12-211-1/+5
* Disable conformance tests for csharp and ruby.Feng Xiao2015-12-212-4/+8
* Update version numbers.Feng Xiao2015-12-214-4/+4
* Build Java conformance tests for JDK7 only.Feng Xiao2015-12-211-1/+9
* Exclude failing objc conformance tests.Feng Xiao2015-12-211-1/+107
* Only try to install GCC 4.8 on Linux.Feng Xiao2015-12-211-6/+8
* Fix Java travis tests.Feng Xiao2015-12-213-6/+8
* Merge branch master into v3.0.0-beta-2Feng Xiao2015-12-2142-1055/+404
|\
| * Merge pull request #1062 from rinatz/masterFeng Xiao2015-12-181-3/+28
| |\
| | * Initialize singleton instance by GoogleOnceInit()Kenichiro IDA2015-12-191-2/+24
| | * Alter FileDescriptorTables::kEmpty to GetEmptyInstance()Kenichiro IDA2015-12-171-3/+6
| * | Merge pull request #1059 from jtattermusch/add_refgen_dependencyJan Tattermusch2015-12-172-0/+14
| |\ \
| | * | add reference generator dependencyJan Tattermusch2015-12-172-0/+14
| * | | Merge pull request #1060 from thomasvl/drop_spinlocksThomas Van Lenten2015-12-1711-874/+53
| |\ \ \
| | * | | Drop all use of OSSpinLockThomas Van Lenten2015-12-1711-874/+53
| | |/ /
| * | | Merge pull request #1052 from tswast/masterFeng Xiao2015-12-173-22/+53
| |\ \ \ | | |/ / | |/| |
| | * | Improves readability of Go example test.Tim Swast2015-12-161-25/+5
| | * | Add region tags to the Go protobuf examples.Tim Swast2015-12-153-22/+73
| * | | Merge pull request #1049 from jskeet/any-formatJon Skeet2015-12-1722-118/+192
| |\ \ \
| | * | | Generated code changes from previous commit.Jon Skeet2015-12-1519-114/+117
| | * | | Make ToString() valid without a type registryJon Skeet2015-12-153-4/+75
| | | |/ | | |/|
| * | | Merge pull request #1051 from jtattermusch/support_coreclrJan Tattermusch2015-12-161-19/+38
| |\ \ \
| | * | | make nuget package support CoreCLRJan Tattermusch2015-12-161-19/+38
| | |/ /
| * | | Merge pull request #1026 from jskeet/any-conformanceJan Tattermusch2015-12-161-19/+24
| |\ \ \ | | |/ / | |/| |
| | * | Add JSON parsing to conformance tests.Jon Skeet2015-12-161-19/+24
| |/ /
| * | Merge pull request #1028 from benbennett/cmake_vs_parallel_build_flagFeng Xiao2015-12-121-0/+2
| |\ \
| | * | MSVC MP flag to build with multiple processes in visual studio.Benjamin Bennett2015-12-071-0/+2