 Feng Xiao
|
e72c751e4d
Fix cmake build on linux.
|
%!s(int64=10) %!d(string=hai) anos |
|
Jon Skeet
|
b1b98e4b79
Merge pull request #738 from jtattermusch/include_descriptor_proto
|
%!s(int64=10) %!d(string=hai) anos |
|
Jon Skeet
|
f6b05f78a4
Merge pull request #739 from jtattermusch/include_descriptor_proto_master
|
%!s(int64=10) %!d(string=hai) anos |
|
Feng Xiao
|
c80f7c6f3c
Merge pull request #742 from xfxyjwf/c11_compile
|
%!s(int64=10) %!d(string=hai) anos |
|
Feng Xiao
|
d9ab86cdbf
Fix compile issues with -std=c++11
|
%!s(int64=10) %!d(string=hai) anos |
|
Jisi Liu
|
f9237d2bcd
Merge pull request #741 from pherl/beta-1
|
%!s(int64=10) %!d(string=hai) anos |
|
Jisi Liu
|
0977815af2
fix "memory leaks" in protostream-object files.
|
%!s(int64=10) %!d(string=hai) anos |
|
Jisi Liu
|
06c9dfd9a3
Merge pull request #740 from pherl/beta-1
|
%!s(int64=10) %!d(string=hai) anos |
|
Jisi Liu
|
01e060f20e
Fix commandline interface file under heapcheck.
|
%!s(int64=10) %!d(string=hai) anos |
|
Feng Xiao
|
b192ba87f7
Merge remote-tracking branch 'origin/master' into beta-1
|
%!s(int64=10) %!d(string=hai) anos |
|
Jan Tattermusch
|
72145dffd8
include descriptor.proto in nuget package
|
%!s(int64=10) %!d(string=hai) anos |
|
Jan Tattermusch
|
295047518c
include descriptor.proto in nuget package
|
%!s(int64=10) %!d(string=hai) anos |
|
Feng Xiao
|
cf94f7b744
Merge pull request #726 from DouglasHeriot/msvc-noinline
|
%!s(int64=10) %!d(string=hai) anos |
|
Jon Skeet
|
8f2892bc62
Remove extraneous TODO
|
%!s(int64=10) %!d(string=hai) anos |
|
Jon Skeet
|
3c74a0c9cc
Change where we rename Descriptor.cs to DescriptorProtoFile.cs.
|
%!s(int64=10) %!d(string=hai) anos |
|
Feng Xiao
|
5da0b46811
Merge pull request #734 from TeBoring/beta-1
|
%!s(int64=10) %!d(string=hai) anos |
|
Bo Yang
|
ff7bdad231
Fix bugs on windows
|
%!s(int64=10) %!d(string=hai) anos |
|
Jisi Liu
|
ed91f89f73
Merge pull request #735 from pherl/beta-1
|
%!s(int64=10) %!d(string=hai) anos |
|
Jisi Liu
|
b90f9f8073
Update cmake and BUILD files.
|
%!s(int64=10) %!d(string=hai) anos |
|
Jisi Liu
|
144ea00659
Merge branch 'beta-1' of github.com:google/protobuf into manual-merge
|
%!s(int64=10) %!d(string=hai) anos |
|
Jisi Liu
|
4c663d810e
Update descriptor protos.
|
%!s(int64=10) %!d(string=hai) anos |
|
Jisi Liu
|
db45aa117a
Merge branch 'beta-1' of github.com:google/protobuf into manual-merge
|
%!s(int64=10) %!d(string=hai) anos |
|
Feng Xiao
|
cc5a1bfede
Make the PARSER @Deprecated public.
|
%!s(int64=10) %!d(string=hai) anos |
|
Jisi Liu
|
56c4f57bb0
Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1
|
%!s(int64=10) %!d(string=hai) anos |
|
Feng Xiao
|
f4ef8fe3b8
Delete incorrectly placed test file.
|
%!s(int64=10) %!d(string=hai) anos |
|
Feng Xiao
|
fbb3ef28c9
Merge Java util package to github.
|
%!s(int64=10) %!d(string=hai) anos |
|
Jon Skeet
|
f9aed2088d
Merge pull request #732 from jskeet/fix-descriptor-proto
|
%!s(int64=10) %!d(string=hai) anos |
|
Jon Skeet
|
31d119af22
Remove extraneous TODO
|
%!s(int64=10) %!d(string=hai) anos |
|
Jon Skeet
|
ca89a1a118
Change where we rename Descriptor.cs to DescriptorProtoFile.cs.
|
%!s(int64=10) %!d(string=hai) anos |
|
Feng Xiao
|
839b180dba
Cherry-pick Java utf8 change.
|
%!s(int64=10) %!d(string=hai) anos |
