2669 Commits (b7bbe54321d3c2176f8f4eba3c18a363dff753d3)
 

Author SHA1 Message Date
Feng Xiao b7bbe54321 Remove an unused typedef. 9 years ago
Feng Xiao 042bfaf67f Merge remote-tracking branch 'origin/master' into beta-1 9 years ago
Feng Xiao b00595a3a9 Merge pull request #709 from xfxyjwf/map_bug 9 years ago
Feng Xiao 11e36b1c39 Merge pull request #747 from jtattermusch/sign_mismatch 9 years ago
Jan Tattermusch 276ce8c15b add static cast to silence signedness comparison warning 9 years ago
Feng Xiao 66b074f491 Merge pull request #744 from xfxyjwf/cmake_linux 9 years ago
Jan Tattermusch 7e05a2d20d Merge pull request #736 from jtattermusch/fix-descriptor-proto 9 years ago
Feng Xiao e72c751e4d Fix cmake build on linux. 9 years ago
Jon Skeet b1b98e4b79 Merge pull request #738 from jtattermusch/include_descriptor_proto 9 years ago
Jon Skeet f6b05f78a4 Merge pull request #739 from jtattermusch/include_descriptor_proto_master 9 years ago
Feng Xiao c80f7c6f3c Merge pull request #742 from xfxyjwf/c11_compile 9 years ago
Feng Xiao d9ab86cdbf Fix compile issues with -std=c++11 9 years ago
Jisi Liu f9237d2bcd Merge pull request #741 from pherl/beta-1 9 years ago
Jisi Liu 0977815af2 fix "memory leaks" in protostream-object files. 9 years ago
Jisi Liu 06c9dfd9a3 Merge pull request #740 from pherl/beta-1 9 years ago
Jisi Liu 01e060f20e Fix commandline interface file under heapcheck. 9 years ago
Feng Xiao b192ba87f7 Merge remote-tracking branch 'origin/master' into beta-1 9 years ago
Jan Tattermusch 72145dffd8 include descriptor.proto in nuget package 9 years ago
Jan Tattermusch 295047518c include descriptor.proto in nuget package 9 years ago
Feng Xiao cf94f7b744 Merge pull request #726 from DouglasHeriot/msvc-noinline 9 years ago
Jon Skeet 8f2892bc62 Remove extraneous TODO 9 years ago
Jon Skeet 3c74a0c9cc Change where we rename Descriptor.cs to DescriptorProtoFile.cs. 9 years ago
Feng Xiao 5da0b46811 Merge pull request #734 from TeBoring/beta-1 9 years ago
Bo Yang ff7bdad231 Fix bugs on windows 9 years ago
Jisi Liu ed91f89f73 Merge pull request #735 from pherl/beta-1 9 years ago
Jisi Liu b90f9f8073 Update cmake and BUILD files. 9 years ago
Jisi Liu 144ea00659 Merge branch 'beta-1' of github.com:google/protobuf into manual-merge 9 years ago
Jisi Liu 4c663d810e Update descriptor protos. 9 years ago
Jisi Liu db45aa117a Merge branch 'beta-1' of github.com:google/protobuf into manual-merge 9 years ago
Feng Xiao cc5a1bfede Make the PARSER @Deprecated public. 9 years ago
Jisi Liu 56c4f57bb0 Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1 9 years ago
Feng Xiao f4ef8fe3b8 Delete incorrectly placed test file. 9 years ago
Feng Xiao fbb3ef28c9 Merge Java util package to github. 9 years ago
Jon Skeet f9aed2088d Merge pull request #732 from jskeet/fix-descriptor-proto 9 years ago
Jon Skeet 31d119af22 Remove extraneous TODO 9 years ago
Jon Skeet ca89a1a118 Change where we rename Descriptor.cs to DescriptorProtoFile.cs. 9 years ago
Feng Xiao 839b180dba Cherry-pick Java utf8 change. 9 years ago
Feng Xiao b17ec3ca11 Down-integrate from internal code base. 9 years ago
Feng Xiao eee38b0c01 Down-integrate from google3. 9 years ago
Joshua Haberman 3253634dcb Merge pull request #711 from tamird/python3-prep 9 years ago
Tamir Duberstein 87993d7507 assertEquals is deprecated 9 years ago
Tamir Duberstein 821fcb2ded Use assertIsInstance 9 years ago
Tamir Duberstein 09831c8768 Clean up exception syntax 9 years ago
Tamir Duberstein 322d8939fc Remove Python 2.5 cruft 9 years ago
Joshua Haberman 3ff5625231 Merge pull request #722 from dano/py2_py3_straddle 9 years ago
Dan O'Reilly 46969b99ca Set DYLD_LIBRARY_PATH for OSX 9 years ago
Dan O'Reilly 76f8a3fbcd Travis now only tests Python2.6 on Linux. 9 years ago
Jisi Liu c3bc155ace Merge branch 'master' of github.com:google/protobuf 9 years ago
Jisi Liu b0f661181d Down-integrate from internal branch. 9 years ago
Douglas Heriot 5021c4d885 Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release build compiler bug. 9 years ago