Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove an unused typedef. | Feng Xiao | 2015-08-26 | 1 | -6/+0 |
* | Merge remote-tracking branch 'origin/master' into beta-1 | Feng Xiao | 2015-08-26 | 2 | -1/+14 |
|\ | |||||
| * | Merge pull request #709 from xfxyjwf/map_bug | Feng Xiao | 2015-08-26 | 2 | -1/+14 |
| |\ | |||||
| | * | Fix map fields parsing. | Feng Xiao | 2015-08-11 | 2 | -1/+14 |
| * | | Merge pull request #739 from jtattermusch/include_descriptor_proto_master | Jon Skeet | 2015-08-26 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | include descriptor.proto in nuget package | Jan Tattermusch | 2015-08-25 | 1 | -0/+1 |
* | | | | Merge pull request #747 from jtattermusch/sign_mismatch | Feng Xiao | 2015-08-26 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | add static cast to silence signedness comparison warning | Jan Tattermusch | 2015-08-26 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #744 from xfxyjwf/cmake_linux | Feng Xiao | 2015-08-26 | 1 | -2/+4 |
|\ \ \ \ | |||||
| * | | | | Fix cmake build on linux. | Feng Xiao | 2015-08-25 | 1 | -2/+4 |
* | | | | | Merge pull request #736 from jtattermusch/fix-descriptor-proto | Jan Tattermusch | 2015-08-26 | 0 | -0/+0 |
|\ \ \ \ \ | |||||
| * | | | | | 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 #738 from jtattermusch/include_descriptor_proto | Jon Skeet | 2015-08-26 | 1 | -0/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | include descriptor.proto in nuget package | Jan Tattermusch | 2015-08-25 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #742 from xfxyjwf/c11_compile | Feng Xiao | 2015-08-25 | 2 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Fix compile issues with -std=c++11 | Feng Xiao | 2015-08-25 | 2 | -3/+3 |
* | | | | | | Merge pull request #741 from pherl/beta-1 | Jisi Liu | 2015-08-25 | 4 | -52/+72 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix "memory leaks" in protostream-object files. | Jisi Liu | 2015-08-25 | 4 | -52/+72 |
* | | | | | | | Merge pull request #740 from pherl/beta-1 | Jisi Liu | 2015-08-25 | 1 | -5/+5 |
|\| | | | | | | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix commandline interface file under heapcheck. | Jisi Liu | 2015-08-25 | 1 | -5/+5 |
| |/ / / / | |||||
* | | | | | 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 |