 Jon Skeet
|
3c74a0c9cc
Change where we rename Descriptor.cs to DescriptorProtoFile.cs.
|
10 лет назад |
|
Feng Xiao
|
5da0b46811
Merge pull request #734 from TeBoring/beta-1
|
10 лет назад |
|
Bo Yang
|
ff7bdad231
Fix bugs on windows
|
10 лет назад |
|
Jisi Liu
|
ed91f89f73
Merge pull request #735 from pherl/beta-1
|
10 лет назад |
|
Jisi Liu
|
b90f9f8073
Update cmake and BUILD files.
|
10 лет назад |
|
Jisi Liu
|
144ea00659
Merge branch 'beta-1' of github.com:google/protobuf into manual-merge
|
10 лет назад |
|
Jisi Liu
|
4c663d810e
Update descriptor protos.
|
10 лет назад |
|
Jisi Liu
|
db45aa117a
Merge branch 'beta-1' of github.com:google/protobuf into manual-merge
|
10 лет назад |
|
Feng Xiao
|
cc5a1bfede
Make the PARSER @Deprecated public.
|
10 лет назад |
|
Jisi Liu
|
56c4f57bb0
Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1
|
10 лет назад |
|
Feng Xiao
|
f4ef8fe3b8
Delete incorrectly placed test file.
|
10 лет назад |
|
Feng Xiao
|
fbb3ef28c9
Merge Java util package to github.
|
10 лет назад |
|
Jon Skeet
|
f9aed2088d
Merge pull request #732 from jskeet/fix-descriptor-proto
|
10 лет назад |
|
Jon Skeet
|
31d119af22
Remove extraneous TODO
|
10 лет назад |
|
Jon Skeet
|
ca89a1a118
Change where we rename Descriptor.cs to DescriptorProtoFile.cs.
|
10 лет назад |
|
Feng Xiao
|
839b180dba
Cherry-pick Java utf8 change.
|
10 лет назад |
|
Feng Xiao
|
b17ec3ca11
Down-integrate from internal code base.
|
10 лет назад |
|
Feng Xiao
|
eee38b0c01
Down-integrate from google3.
|
10 лет назад |
|
Joshua Haberman
|
3253634dcb
Merge pull request #711 from tamird/python3-prep
|
10 лет назад |
|
Dan O'Reilly
|
38eef02aab
Fix metaclass issue on Python 3. Get text handling tests passing on Python 3.
|
10 лет назад |
|
Dan O'Reilly
|
fc80874adf
Start work on getting text handled properly on PY3
|
10 лет назад |
|
Tamir Duberstein
|
87993d7507
assertEquals is deprecated
|
10 лет назад |
|
Tamir Duberstein
|
821fcb2ded
Use assertIsInstance
|
10 лет назад |
|
Tamir Duberstein
|
09831c8768
Clean up exception syntax
|
10 лет назад |
|
Tamir Duberstein
|
322d8939fc
Remove Python 2.5 cruft
|
10 лет назад |
|
Joshua Haberman
|
3ff5625231
Merge pull request #722 from dano/py2_py3_straddle
|
10 лет назад |
|
Dan O'Reilly
|
46969b99ca
Set DYLD_LIBRARY_PATH for OSX
|
10 лет назад |
|
Dan O'Reilly
|
76f8a3fbcd
Travis now only tests Python2.6 on Linux.
|
10 лет назад |
|
Jisi Liu
|
c3bc155ace
Merge branch 'master' of github.com:google/protobuf
|
10 лет назад |
|
Jisi Liu
|
b0f661181d
Down-integrate from internal branch.
|
10 лет назад |
