Commit History

Autor SHA1 Mensaxe Data
  Jisi Liu 1a7a7fca80 Merge from google internal %!s(int64=8) %!d(string=hai) anos
  Jisi Liu 09354db143 Merge from Google internal for 3.4 release %!s(int64=8) %!d(string=hai) anos
  Feng Xiao d36c0c538a Down-integrate from google3. %!s(int64=8) %!d(string=hai) anos
  Bo Yang cc8ca5b6a5 Integrate internal changes %!s(int64=9) %!d(string=hai) anos
  Adam Cozzette b83af525db Fixed string formatting in text_format.py to be Python2.6-compatible %!s(int64=9) %!d(string=hai) anos
  Adam Cozzette d64a2d9941 Integrated internal changes from Google %!s(int64=9) %!d(string=hai) anos
  Jisi Liu cf14183bcd Down integrate from Google internal. %!s(int64=9) %!d(string=hai) anos
  Jisi Liu 3b3c8abb96 Integrate google internal changes. %!s(int64=9) %!d(string=hai) anos
  Feng Xiao e841bac4fc Down-integrate from internal code base. %!s(int64=10) %!d(string=hai) anos
  Jisi Liu 46e8ff63cb Down-integrate from google internal. %!s(int64=10) %!d(string=hai) anos
  Feng Xiao e94e062b58 Merge branch 'master' of github.com:google/protobuf into beta-1 %!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
  Feng Xiao eee38b0c01 Down-integrate from google3. %!s(int64=10) %!d(string=hai) anos
  Dan O'Reilly 38eef02aab Fix metaclass issue on Python 3. Get text handling tests passing on Python 3. %!s(int64=10) %!d(string=hai) anos
  Dan O'Reilly fc80874adf Start work on getting text handled properly on PY3 %!s(int64=10) %!d(string=hai) anos
  Dan O'Reilly 7601551f7c Just always uses BytseIO in text_format for now %!s(int64=10) %!d(string=hai) anos
  Dan O'Reilly 3d5aa6aef9 Fix some more Python 3 compat issues %!s(int64=10) %!d(string=hai) anos
  Dan O'Reilly fe7d9379df Fixing some long/int bugs %!s(int64=10) %!d(string=hai) anos
  Dan O'Reilly e47cdd5a55 Merge remote-tracking branch 'upstream/master' into py2_py3_straddle %!s(int64=10) %!d(string=hai) anos
  Bo Yang 5db217305f down-integrate internal changes %!s(int64=10) %!d(string=hai) anos
  Jisi Liu ada6556785 Down integrate from Google internal. %!s(int64=10) %!d(string=hai) anos
  Tres Seaver 47ee4d37c1 Use 'io.BytesIO' rather than 'cStringIO.StringIO'. %!s(int64=10) %!d(string=hai) anos
  Tres Seaver f336d4b7a5 Prepare for Python2-Python3 straddle. %!s(int64=10) %!d(string=hai) anos
  Feng Xiao 99aa0f9e8f Down-integrate from internal code base. %!s(int64=11) %!d(string=hai) anos
  Feng Xiao f157a5651c Down-integrate from internal code base (C++ maps support). %!s(int64=11) %!d(string=hai) anos
  Feng Xiao 6ef984af4b Down-integrate from internal code base. %!s(int64=11) %!d(string=hai) anos
  Feng Xiao e428862450 Replace links to code.google.com/protobuf with developers.google.com/protocol-buffers %!s(int64=11) %!d(string=hai) anos
  jieluo@google.com bde4a3254a down integrate python opensource to svn %!s(int64=11) %!d(string=hai) anos
  xiaofeng@google.com 7f372559cc Down-integrate from internal branch %!s(int64=12) %!d(string=hai) anos
  xiaofeng@google.com b55a20fa2c Down-integrate from internal branch %!s(int64=13) %!d(string=hai) anos