aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update version number.Feng Xiao2015-08-2610-14/+14
* Remove an unused typedef.Feng Xiao2015-08-261-6/+0
* Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao2015-08-262-1/+14
|\
| * Merge pull request #709 from xfxyjwf/map_bugFeng Xiao2015-08-262-1/+14
| |\
| | * Fix map fields parsing.Feng Xiao2015-08-112-1/+14
| * | Merge pull request #739 from jtattermusch/include_descriptor_proto_masterJon Skeet2015-08-261-0/+1
| |\ \
| | * | include descriptor.proto in nuget packageJan Tattermusch2015-08-251-0/+1
* | | | Merge pull request #747 from jtattermusch/sign_mismatchFeng Xiao2015-08-261-1/+1
|\ \ \ \
| * | | | add static cast to silence signedness comparison warningJan Tattermusch2015-08-261-1/+1
|/ / / /
* | | | Merge pull request #744 from xfxyjwf/cmake_linuxFeng Xiao2015-08-261-2/+4
|\ \ \ \
| * | | | Fix cmake build on linux.Feng Xiao2015-08-251-2/+4
* | | | | Merge pull request #736 from jtattermusch/fix-descriptor-protoJan Tattermusch2015-08-260-0/+0
|\ \ \ \ \
| * | | | | Remove extraneous TODOJon Skeet2015-08-251-1/+0
| * | | | | Change where we rename Descriptor.cs to DescriptorProtoFile.cs.Jon Skeet2015-08-255-123/+122
* | | | | | Merge pull request #738 from jtattermusch/include_descriptor_protoJon Skeet2015-08-261-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | include descriptor.proto in nuget packageJan Tattermusch2015-08-251-0/+1
| |/ / / /
* | | | | Merge pull request #742 from xfxyjwf/c11_compileFeng Xiao2015-08-252-3/+3
|\ \ \ \ \
| * | | | | Fix compile issues with -std=c++11Feng Xiao2015-08-252-3/+3
* | | | | | Merge pull request #741 from pherl/beta-1Jisi Liu2015-08-254-52/+72
|\ \ \ \ \ \
| * | | | | | fix "memory leaks" in protostream-object files.Jisi Liu2015-08-254-52/+72
* | | | | | | Merge pull request #740 from pherl/beta-1Jisi Liu2015-08-251-5/+5
|\| | | | | | | |/ / / / / |/| | | | |
| * | | | | Fix commandline interface file under heapcheck.Jisi Liu2015-08-251-5/+5
| |/ / / /
* | | | | Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao2015-08-2540-889/+598
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge pull request #726 from DouglasHeriot/msvc-noinlineFeng Xiao2015-08-256-23/+31
| |\ \ \ | | |/ / | |/| |
| | * | Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release buil...Douglas Heriot2015-08-226-23/+31
| * | | Merge pull request #732 from jskeet/fix-descriptor-protoJon Skeet2015-08-255-124/+122
| |\ \ \
| | * | | Remove extraneous TODOJon Skeet2015-08-251-1/+0
| | * | | Change where we rename Descriptor.cs to DescriptorProtoFile.cs.Jon Skeet2015-08-255-123/+122
| |/ / /
| * | | Merge pull request #711 from tamird/python3-prepJoshua Haberman2015-08-226-41/+25
| |\ \ \
| | * | | assertEquals is deprecatedTamir Duberstein2015-08-221-4/+4
| | * | | Use assertIsInstanceTamir Duberstein2015-08-223-17/+13
| | * | | Clean up exception syntaxTamir Duberstein2015-08-221-2/+0
| | * | | Remove Python 2.5 cruftTamir Duberstein2015-08-222-18/+8
| |/ / /
| * | | Merge pull request #722 from dano/py2_py3_straddleJoshua Haberman2015-08-2231-728/+448
| |\ \ \
| | * | | Set DYLD_LIBRARY_PATH for OSXDan O'Reilly2015-08-211-0/+1
| | * | | Travis now only tests Python2.6 on Linux.Dan O'Reilly2015-08-211-6/+21
| | * | | Fix travis buildDan O'Reilly2015-08-202-0/+3
| | * | | Improve tox.ini, install py26 for travis.Dan O'Reilly2015-08-202-12/+24
| | * | | Remove debug codeDan O'Reilly2015-08-201-1/+0
| | * | | Install tox during travis build.Dan O'Reilly2015-08-201-0/+2
| | * | | Remove ez_setup.py from Makefile.amDan O'Reilly2015-08-201-1/+0
| | * | | Use tox in travis build. Tweak tox.iniDan O'Reilly2015-08-203-10/+6
| | * | | Merge branch 'py2_py3_straddle' of github.com:dano/protobuf into py2_py3_stra...Dan O'Reilly2015-08-201-1/+0
| | |\ \ \
| | | * | | Fix duplicate entry in .gitignoreDan O'Reilly2015-08-181-1/+0
| | * | | | Add some clarifying comments. Remove ez_setup.py.Dan O'Reilly2015-08-204-345/+5
| | |/ / /
| | * | | Make testing cpp implementation optionalDan O'Reilly2015-08-161-2/+1
| | * | | Fix --cpp_implementation test failure. Test both pure Python and cpp implemen...Dan O'Reilly2015-08-152-8/+9
| | * | | Just always uses BytseIO in text_format for nowDan O'Reilly2015-08-141-4/+1
| | * | | Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-1410-244/+471
| | |\| |
| | * | | Disable py3* in toxDan O'Reilly2015-08-141-1/+2