aboutsummaryrefslogtreecommitdiff
path: root/python/google/protobuf/internal/generator_test.py
Commit message (Expand)AuthorAgeFilesLines
* Integrate internal changesBo Yang2016-10-101-1/+2
* Integrate google internal changes.Jisi Liu2016-03-301-1/+2
* Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao2015-08-251-12/+15
|\
| * Get Python 2.6 working.Dan O'Reilly2015-08-141-2/+5
| * Fix usage of assertItemsEqual on Py3Dan O'Reilly2015-08-141-2/+2
| * Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-121-4/+3
| |\
| * | Straddle Python 2.6, 2.7, 3.3, 3.4.Tres Seaver2015-01-131-8/+8
| * | Merge branch 'drop-apputils-dependency' into straddle_py2_py3Tres Seaver2015-01-131-4/+5
| |\ \
| | * | Drop dependency on 'google.apputils'.Tres Seaver2015-01-131-4/+5
| * | | Prepare for Python2-Python3 straddle.Tres Seaver2015-01-131-1/+1
| |/ /
* | / Down-integrate from google3.Feng Xiao2015-08-221-1/+2
| |/ |/|
* | down-integrate internal changesBo Yang2015-05-211-1/+0
* | Don't hard-code the python pathTamir Duberstein2015-05-061-1/+1
* | [PYTHON] Drop dependency on 'google.apputils'.Tamir Duberstein2015-04-101-5/+6
|/
* Down-integrate from internal code base (C++ maps support).Feng Xiao2014-11-141-2/+0
* Merge branch 'typofixes-vlajos-20141108' of https://github.com/vlajos/protobu...Feng Xiao2014-11-111-1/+1
|\
| * typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-081-1/+1
* | Down-integrate from internal code base.Feng Xiao2014-11-101-1/+3
|/
* Replace links to code.google.com/protobuf with developers.google.com/protocol...Feng Xiao2014-10-011-1/+1
* down integrate python opensource to svnjieluo@google.com2014-08-121-4/+78
* Down-integrate from internal branchxiaofeng@google.com2012-09-221-0/+25
* Escape C++ Trigraphs.liujisi@google.com2010-12-211-0/+1
* Submit recent changes from internal branch. See CHANGES.txt for more details.liujisi@google.com2010-11-021-4/+27
* In Python, avoid relying on float('inf') and float('nan') as these don't work...kenton@google.com2009-12-231-6/+21
* Massive roll-up of changes. See CHANGES.txt.kenton@google.com2009-12-181-1/+106
* Integrate changes from internal code.kenton@google.com2008-11-211-0/+2
* Integrate changes from internal Google-internal branch.kenton@google.com2008-09-241-10/+24
* Initial checkin.temporal2008-07-101-0/+84