2659 Commits (7e05a2d20d07279f125723f9ab7b1864badf0996)
 

Author SHA1 Message Date
Jan Tattermusch 7e05a2d20d Merge pull request #736 from jtattermusch/fix-descriptor-proto 10 years ago
Jon Skeet b1b98e4b79 Merge pull request #738 from jtattermusch/include_descriptor_proto 10 years ago
Feng Xiao c80f7c6f3c Merge pull request #742 from xfxyjwf/c11_compile 10 years ago
Feng Xiao d9ab86cdbf Fix compile issues with -std=c++11 10 years ago
Jisi Liu f9237d2bcd Merge pull request #741 from pherl/beta-1 10 years ago
Jisi Liu 0977815af2 fix "memory leaks" in protostream-object files. 10 years ago
Jisi Liu 06c9dfd9a3 Merge pull request #740 from pherl/beta-1 10 years ago
Jisi Liu 01e060f20e Fix commandline interface file under heapcheck. 10 years ago
Feng Xiao b192ba87f7 Merge remote-tracking branch 'origin/master' into beta-1 10 years ago
Jan Tattermusch 295047518c include descriptor.proto in nuget package 10 years ago
Feng Xiao cf94f7b744 Merge pull request #726 from DouglasHeriot/msvc-noinline 10 years ago
Jon Skeet 8f2892bc62 Remove extraneous TODO 10 years ago
Jon Skeet 3c74a0c9cc Change where we rename Descriptor.cs to DescriptorProtoFile.cs. 10 years ago
Feng Xiao 5da0b46811 Merge pull request #734 from TeBoring/beta-1 10 years ago
Bo Yang ff7bdad231 Fix bugs on windows 10 years ago
Jisi Liu ed91f89f73 Merge pull request #735 from pherl/beta-1 10 years ago
Jisi Liu b90f9f8073 Update cmake and BUILD files. 10 years ago
Jisi Liu 144ea00659 Merge branch 'beta-1' of github.com:google/protobuf into manual-merge 10 years ago
Jisi Liu 4c663d810e Update descriptor protos. 10 years ago
Jisi Liu db45aa117a Merge branch 'beta-1' of github.com:google/protobuf into manual-merge 10 years ago
Feng Xiao cc5a1bfede Make the PARSER @Deprecated public. 10 years ago
Jisi Liu 56c4f57bb0 Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1 10 years ago
Feng Xiao f4ef8fe3b8 Delete incorrectly placed test file. 10 years ago
Feng Xiao fbb3ef28c9 Merge Java util package to github. 10 years ago
Jon Skeet f9aed2088d Merge pull request #732 from jskeet/fix-descriptor-proto 10 years ago
Jon Skeet 31d119af22 Remove extraneous TODO 10 years ago
Jon Skeet ca89a1a118 Change where we rename Descriptor.cs to DescriptorProtoFile.cs. 10 years ago
Feng Xiao 839b180dba Cherry-pick Java utf8 change. 10 years ago
Feng Xiao b17ec3ca11 Down-integrate from internal code base. 10 years ago
Feng Xiao eee38b0c01 Down-integrate from google3. 10 years ago
Joshua Haberman 3253634dcb Merge pull request #711 from tamird/python3-prep 10 years ago
Tamir Duberstein 87993d7507 assertEquals is deprecated 10 years ago
Tamir Duberstein 821fcb2ded Use assertIsInstance 10 years ago
Tamir Duberstein 09831c8768 Clean up exception syntax 10 years ago
Tamir Duberstein 322d8939fc Remove Python 2.5 cruft 10 years ago
Joshua Haberman 3ff5625231 Merge pull request #722 from dano/py2_py3_straddle 10 years ago
Dan O'Reilly 46969b99ca Set DYLD_LIBRARY_PATH for OSX 10 years ago
Dan O'Reilly 76f8a3fbcd Travis now only tests Python2.6 on Linux. 10 years ago
Jisi Liu c3bc155ace Merge branch 'master' of github.com:google/protobuf 10 years ago
Jisi Liu b0f661181d Down-integrate from internal branch. 10 years ago
Douglas Heriot 5021c4d885 Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release build compiler bug. 10 years ago
Joshua Haberman eb65c69e14 Merge pull request #584 from haberman/cwarnings 10 years ago
Dan O'Reilly 3791c8051a Fix travis build 10 years ago
Josh Haberman d61e6adfcc Return TypedData_Wrap_Struct directly. 10 years ago
Dan O'Reilly 5de2a81b01 Improve tox.ini, install py26 for travis. 10 years ago
Dan O'Reilly afa488c4d1 Remove debug code 10 years ago
Dan O'Reilly 5029c7b7d3 Install tox during travis build. 10 years ago
Dan O'Reilly 4a0129f680 Remove ez_setup.py from Makefile.am 10 years ago
Dan O'Reilly 416f001adc Use tox in travis build. Tweak tox.ini 10 years ago
Dan O'Reilly de22561b7b Merge branch 'py2_py3_straddle' of github.com:dano/protobuf into py2_py3_straddle 10 years ago