2693 Commits (fcdcf88d8a4be7e16733f412d74b6cbcff2411de)
 

Author SHA1 Message Date
Feng Xiao fcdcf88d8a Fix merge conflict. 10 years ago
Feng Xiao f900837afa Merge pull request #756 from TeBoring/beta-1 10 years ago
Feng Xiao a3312983d6 Update Makefile.am to include missing files. 10 years ago
Feng Xiao 99e1868586 Add missing files in dist. 10 years ago
Bo Yang 1c81d0f8be Add distribution for objc 10 years ago
Jisi Liu 28595b25ba Merge pull request #755 from pherl/beta-1 10 years ago
Jisi Liu 4008100e37 Add bazel build/workspace into distribution. 10 years ago
Feng Xiao 5b771ed651 Merge pull request #754 from xfxyjwf/changelog 10 years ago
Feng Xiao cc60753820 Update change log for beta-1. 10 years ago
Paul Yang 106f3eb985 Merge pull request #750 from TeBoring/beta-1 10 years ago
TeBoring aca5a60883 Fix bugs for objectivec 10 years ago
Feng Xiao e94e062b58 Merge branch 'master' of github.com:google/protobuf into beta-1 10 years ago
Joshua Haberman c7a1f8ec3b Merge pull request #728 from dano/py3_str_compat 10 years ago
Feng Xiao fecc3d5963 Update post_process_dist.sh 10 years ago
Feng Xiao 08da3d4997 Merge pull request #751 from xfxyjwf/version_number 10 years ago
Feng Xiao 7ecc19f04f Merge pull request #752 from google/jtattermusch-patch-1 10 years ago
Jan Tattermusch 8fca6f83c6 Update README.md for C# 10 years ago
Feng Xiao ffe9215140 Update version number. 10 years ago
Feng Xiao 047a97ff44 Merge pull request #749 from xfxyjwf/mingw_endian 10 years ago
Feng Xiao d9f4636818 Add a TODO to clean-up the LITTLE_ENDIAN macro. 10 years ago
Feng Xiao b47bf4c930 Assume LITTLE_ENDIAN for windows build. 10 years ago
Feng Xiao d7d9accc1d Merge pull request #748 from xfxyjwf/unused_typedef 10 years ago
Feng Xiao b7bbe54321 Remove an unused typedef. 10 years ago
Feng Xiao 042bfaf67f Merge remote-tracking branch 'origin/master' into beta-1 10 years ago
Feng Xiao b00595a3a9 Merge pull request #709 from xfxyjwf/map_bug 10 years ago
Feng Xiao 11e36b1c39 Merge pull request #747 from jtattermusch/sign_mismatch 10 years ago
Jan Tattermusch 276ce8c15b add static cast to silence signedness comparison warning 10 years ago
Feng Xiao 66b074f491 Merge pull request #744 from xfxyjwf/cmake_linux 10 years ago
Jan Tattermusch 7e05a2d20d Merge pull request #736 from jtattermusch/fix-descriptor-proto 10 years ago
Feng Xiao e72c751e4d Fix cmake build on linux. 10 years ago
Jon Skeet b1b98e4b79 Merge pull request #738 from jtattermusch/include_descriptor_proto 10 years ago
Jon Skeet f6b05f78a4 Merge pull request #739 from jtattermusch/include_descriptor_proto_master 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 72145dffd8 include descriptor.proto in nuget package 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