| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/master' into beta-1 | Feng Xiao | 2015-08-25 | 40 | -889/+598 |
| |\ | |||||
| | * | Merge pull request #726 from DouglasHeriot/msvc-noinline | Feng Xiao | 2015-08-25 | 6 | -23/+31 |
| | |\ | |||||
| | | * | Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release buil... | Douglas Heriot | 2015-08-22 | 6 | -23/+31 |
| | * | | Merge pull request #732 from jskeet/fix-descriptor-proto | Jon Skeet | 2015-08-25 | 5 | -124/+122 |
| | |\ \ | |||||
| | | * | | Remove extraneous TODO | Jon Skeet | 2015-08-25 | 1 | -1/+0 |
| | | * | | Change where we rename Descriptor.cs to DescriptorProtoFile.cs. | Jon Skeet | 2015-08-25 | 5 | -123/+122 |
| | |/ / | |||||
| | * | | Merge pull request #711 from tamird/python3-prep | Joshua Haberman | 2015-08-22 | 6 | -41/+25 |
| | |\ \ | |||||
| | | * | | assertEquals is deprecated | Tamir Duberstein | 2015-08-22 | 1 | -4/+4 |
| | | * | | Use assertIsInstance | Tamir Duberstein | 2015-08-22 | 3 | -17/+13 |
| | | * | | Clean up exception syntax | Tamir Duberstein | 2015-08-22 | 1 | -2/+0 |
| | | * | | Remove Python 2.5 cruft | Tamir Duberstein | 2015-08-22 | 2 | -18/+8 |
| | |/ / | |||||
| | * | | Merge pull request #722 from dano/py2_py3_straddle | Joshua Haberman | 2015-08-22 | 31 | -728/+448 |
| | |\ \ | |||||
| | | * | | Set DYLD_LIBRARY_PATH for OSX | Dan O'Reilly | 2015-08-21 | 1 | -0/+1 |
| | | * | | Travis now only tests Python2.6 on Linux. | Dan O'Reilly | 2015-08-21 | 1 | -6/+21 |
| | | * | | Fix travis build | Dan O'Reilly | 2015-08-20 | 2 | -0/+3 |
| | | * | | Improve tox.ini, install py26 for travis. | Dan O'Reilly | 2015-08-20 | 2 | -12/+24 |
| | | * | | Remove debug code | Dan O'Reilly | 2015-08-20 | 1 | -1/+0 |
| | | * | | Install tox during travis build. | Dan O'Reilly | 2015-08-20 | 1 | -0/+2 |
| | | * | | Remove ez_setup.py from Makefile.am | Dan O'Reilly | 2015-08-20 | 1 | -1/+0 |
| | | * | | Use tox in travis build. Tweak tox.ini | Dan O'Reilly | 2015-08-20 | 3 | -10/+6 |
| | | * | | Merge branch 'py2_py3_straddle' of github.com:dano/protobuf into py2_py3_stra... | Dan O'Reilly | 2015-08-20 | 1 | -1/+0 |
| | | |\ \ | |||||
| | | | * | | Fix duplicate entry in .gitignore | Dan O'Reilly | 2015-08-18 | 1 | -1/+0 |
| | | * | | | Add some clarifying comments. Remove ez_setup.py. | Dan O'Reilly | 2015-08-20 | 4 | -345/+5 |
| | | |/ / | |||||
| | | * | | Make testing cpp implementation optional | Dan O'Reilly | 2015-08-16 | 1 | -2/+1 |
| | | * | | Fix --cpp_implementation test failure. Test both pure Python and cpp implemen... | Dan O'Reilly | 2015-08-15 | 2 | -8/+9 |
| | | * | | Just always uses BytseIO in text_format for now | Dan O'Reilly | 2015-08-14 | 1 | -4/+1 |
| | | * | | Merge remote-tracking branch 'upstream/master' into py2_py3_straddle | Dan O'Reilly | 2015-08-14 | 10 | -244/+471 |
| | | |\| | |||||
| | | * | | Disable py3* in tox | Dan O'Reilly | 2015-08-14 | 1 | -1/+2 |
| | | * | | Get Python 2.6 working. | Dan O'Reilly | 2015-08-14 | 17 | -69/+104 |
| | | * | | Fix usage of assertItemsEqual on Py3 | Dan O'Reilly | 2015-08-14 | 1 | -2/+2 |
| | | * | | Fix some more Python 3 compat issues | Dan O'Reilly | 2015-08-14 | 3 | -14/+25 |
| | | * | | Fixing some long/int bugs | Dan O'Reilly | 2015-08-14 | 4 | -12/+21 |
| | | * | | Merge remote-tracking branch 'upstream/master' into py2_py3_straddle | Dan O'Reilly | 2015-08-14 | 11 | -125/+470 |
| | | |\ \ | |||||
| | | * | | | Build protobuf files in as part of tox runs. | Dan O'Reilly | 2015-08-13 | 1 | -0/+1 |
| | | * | | | Fixing some tests | Dan O'Reilly | 2015-08-13 | 4 | -42/+30 |
| | | * | | | Merge remote-tracking branch 'upstream/master' into py2_py3_straddle | Dan O'Reilly | 2015-08-12 | 930 | -21697/+246414 |
| | | |\ \ \ | |||||
| | | * | | | | Declare explicit support for Python 3.3 and 3.4. | Tres Seaver | 2015-01-13 | 1 | -0/+4 |
| | | * | | | | Merge branch 'python-update_setup' into straddle_py2_py3 | Tres Seaver | 2015-01-13 | 2 | -37/+32 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Noramlize 'setup.py' to fit conventions: | Tres Seaver | 2015-01-13 | 2 | -37/+32 |
| | | * | | | | | Merge branch 'update-ez_setup' into straddle_py2_py3 | Tres Seaver | 2015-01-13 | 1 | -244/+292 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Update to new canonical 'ez_setup.py'. | Tres Seaver | 2015-01-13 | 1 | -244/+292 |
| | | | |/ / / / | |||||
| | | * | | | | | Test under tox: Python 2.6, 2.7, 3.3, 3.4. | Tres Seaver | 2015-01-13 | 1 | -0/+13 |
| | | * | | | | | Ignore more derived files. | Tres Seaver | 2015-01-13 | 1 | -1/+2 |
| | | * | | | | | Merge branch 'ignore_so_libs' into straddle_py2_py3 | Tres Seaver | 2015-01-13 | 1 | -0/+1 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Ignore .so files. | Tres Seaver | 2015-01-13 | 1 | -0/+1 |
| | | | |/ / / / | |||||
| | | * | | | | | Straddle Python 2.6, 2.7, 3.3, 3.4. | Tres Seaver | 2015-01-13 | 10 | -123/+123 |
| | | * | | | | | Don't check in derived objects. | Tres Seaver | 2015-01-13 | 2 | -0/+0 |
| | | * | | | | | Compatibility with Python2.6 unittest. | Tres Seaver | 2015-01-13 | 4 | -21/+35 |
| | | * | | | | | Use 'io.BytesIO' rather than 'cStringIO.StringIO'. | Tres Seaver | 2015-01-13 | 2 | -3/+3 |
| | | * | | | | | Typo. | Tres Seaver | 2015-01-13 | 1 | -1/+1 |
 |
index : protobuf | |
| Protocol Buffers - Google's data interchange format |
| aboutsummaryrefslogtreecommitdiff |