aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Merge pull request #746 from zmodem/fix_predict_macros2Gravatar Feng Xiao2015-08-27
|\
* \ Merge pull request #767 from pkasting/portGravatar Feng Xiao2015-08-27
|\ \
| * | Avoid #including system headers from inside a namespace.Gravatar Peter Kasting2015-08-27
|/ /
* | Merge pull request #728 from dano/py3_str_compatGravatar Joshua Haberman2015-08-26
|\ \
* \ \ Merge pull request #709 from xfxyjwf/map_bugGravatar Feng Xiao2015-08-26
|\ \ \
| | | * Fix the no-op definitions of GOOGLE_PREDICT_{TRUE,FALSE}Gravatar Hans Wennborg2015-08-26
| |_|/ |/| |
* | | Merge pull request #739 from jtattermusch/include_descriptor_proto_masterGravatar Jon Skeet2015-08-26
|\ \ \
| * | | include descriptor.proto in nuget packageGravatar Jan Tattermusch2015-08-25
* | | | Merge pull request #726 from DouglasHeriot/msvc-noinlineGravatar Feng Xiao2015-08-25
|\ \ \ \ | |/ / / |/| | |
* | | | Merge pull request #732 from jskeet/fix-descriptor-protoGravatar Jon Skeet2015-08-25
|\ \ \ \
| * | | | Remove extraneous TODOGravatar Jon Skeet2015-08-25
| * | | | Change where we rename Descriptor.cs to DescriptorProtoFile.cs.Gravatar Jon Skeet2015-08-25
|/ / / /
* | | | Merge pull request #711 from tamird/python3-prepGravatar Joshua Haberman2015-08-22
|\ \ \ \
| | | | * Fix metaclass issue on Python 3. Get text handling tests passing on Python 3.Gravatar Dan O'Reilly2015-08-22
| | | | * Start work on getting text handled properly on PY3Gravatar Dan O'Reilly2015-08-22
| |_|_|/ |/| | |
| * | | assertEquals is deprecatedGravatar Tamir Duberstein2015-08-22
| * | | Use assertIsInstanceGravatar Tamir Duberstein2015-08-22
| * | | Clean up exception syntaxGravatar Tamir Duberstein2015-08-22
| * | | Remove Python 2.5 cruftGravatar Tamir Duberstein2015-08-22
|/ / /
* | | Merge pull request #722 from dano/py2_py3_straddleGravatar Joshua Haberman2015-08-22
|\ \ \
| * | | Set DYLD_LIBRARY_PATH for OSXGravatar Dan O'Reilly2015-08-21
| * | | Travis now only tests Python2.6 on Linux.Gravatar Dan O'Reilly2015-08-21
| | * | Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release buil...Gravatar Douglas Heriot2015-08-22
* | | | Merge pull request #584 from haberman/cwarningsGravatar Joshua Haberman2015-08-21
|\ \ \ \ | |_|/ / |/| | |
| | * | Fix travis buildGravatar Dan O'Reilly2015-08-20
| * | | Return TypedData_Wrap_Struct directly.Gravatar Josh Haberman2015-08-20
| | * | Improve tox.ini, install py26 for travis.Gravatar Dan O'Reilly2015-08-20
| | * | Remove debug codeGravatar Dan O'Reilly2015-08-20
| | * | Install tox during travis build.Gravatar Dan O'Reilly2015-08-20
| | * | Remove ez_setup.py from Makefile.amGravatar Dan O'Reilly2015-08-20
| | * | Use tox in travis build. Tweak tox.iniGravatar Dan O'Reilly2015-08-20
| | * | Merge branch 'py2_py3_straddle' of github.com:dano/protobuf into py2_py3_stra...Gravatar Dan O'Reilly2015-08-20
| | |\ \
| | * | | Add some clarifying comments. Remove ez_setup.py.Gravatar Dan O'Reilly2015-08-20
| | | * | Fix duplicate entry in .gitignoreGravatar Dan O'Reilly2015-08-18
| | |/ /
| | * | Make testing cpp implementation optionalGravatar Dan O'Reilly2015-08-16
| | * | Fix --cpp_implementation test failure. Test both pure Python and cpp implemen...Gravatar Dan O'Reilly2015-08-15
| | * | Just always uses BytseIO in text_format for nowGravatar Dan O'Reilly2015-08-14
| | * | Merge remote-tracking branch 'upstream/master' into py2_py3_straddleGravatar Dan O'Reilly2015-08-14
| | |\ \ | |_|/ / |/| | |
| | * | Disable py3* in toxGravatar Dan O'Reilly2015-08-14
| | * | Get Python 2.6 working.Gravatar Dan O'Reilly2015-08-14
* | | | Merge pull request #720 from jtattermusch/csharp_fixesGravatar Jon Skeet2015-08-14
|\ \ \ \
| * | | | fix type initialization problem with FileDescriptorGravatar Jan Tattermusch2015-08-14
| * | | | add a failing descriptor testGravatar Jan Tattermusch2015-08-14
| * | | | remove duplicate test caseGravatar Jan Tattermusch2015-08-14
| | | * | Fix usage of assertItemsEqual on Py3Gravatar Dan O'Reilly2015-08-14
| | | * | Fix some more Python 3 compat issuesGravatar Dan O'Reilly2015-08-14
* | | | | Merge pull request #571 from thomasvl/validation_supportGravatar Paul Yang2015-08-14
|\ \ \ \ \ | |/ / / / |/| | | |
| | | * | Fixing some long/int bugsGravatar Dan O'Reilly2015-08-14
| | | * | Merge remote-tracking branch 'upstream/master' into py2_py3_straddleGravatar Dan O'Reilly2015-08-14
| | | |\ \ | |_|_|/ / |/| | | |
| * | | | Add support for a file listing expected package to objc prefixes for validation.Gravatar Thomas Van Lenten2015-08-14