aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Declare explicit support for Python 3.3 and 3.4.Tres Seaver2015-01-131-0/+4
* Merge branch 'python-update_setup' into straddle_py2_py3Tres Seaver2015-01-132-37/+32
|\
| * Noramlize 'setup.py' to fit conventions:Tres Seaver2015-01-132-37/+32
* | Merge branch 'update-ez_setup' into straddle_py2_py3Tres Seaver2015-01-131-244/+292
|\ \
| * | Update to new canonical 'ez_setup.py'.Tres Seaver2015-01-131-244/+292
| |/
* | Test under tox: Python 2.6, 2.7, 3.3, 3.4.Tres Seaver2015-01-131-0/+13
* | Ignore more derived files.Tres Seaver2015-01-131-1/+2
* | Merge branch 'ignore_so_libs' into straddle_py2_py3Tres Seaver2015-01-131-0/+1
|\ \
| * | Ignore .so files.Tres Seaver2015-01-131-0/+1
| |/
* | Straddle Python 2.6, 2.7, 3.3, 3.4.Tres Seaver2015-01-1310-123/+123
* | Don't check in derived objects.Tres Seaver2015-01-132-0/+0
* | Compatibility with Python2.6 unittest.Tres Seaver2015-01-134-21/+35
* | Use 'io.BytesIO' rather than 'cStringIO.StringIO'.Tres Seaver2015-01-132-3/+3
* | Typo.Tres Seaver2015-01-131-1/+1
* | Merge branch 'prep_for_py2_py3_straddle' into straddle_py2_py3Tres Seaver2015-01-131-1/+1
|\ \
| * | Overlooked dependency.Tres Seaver2015-01-131-1/+1
* | | Merge branch 'drop-apputils-dependency' into straddle_py2_py3Tres Seaver2015-01-1324-96/+100
|\ \ \ | |/ / |/| |
| * | Drop dependency on 'google.apputils'.Tres Seaver2015-01-1322-96/+100
| |/
* / Prepare for Python2-Python3 straddle.Tres Seaver2015-01-1315-198/+144
|/
* Merge pull request #160 from zhangkun83/masterFeng Xiao2015-01-122-0/+88
|\
| * Align backslash verticallyzhangkun832015-01-121-1/+1
| * Include names.h as java_names.h in the opensource treezhangkun832015-01-122-0/+88
|/
* Merge pull request #143 from Ivoz/patch-1Feng Xiao2014-12-221-2/+2
|\
| * Update python version / setuptools instructionsMatt Iversen2014-12-171-2/+2
* | Merge pull request #46 from adalq/versionFeng Xiao2014-12-201-0/+35
|\ \
| * | Updated __version__Adal Chiriliuc2014-12-141-1/+1
| * | Add __version__Adal Chiriliuc2014-10-101-0/+35
| * | Revert "Add __version__"Adal Chiriliuc2014-10-102-35/+0
| * | Add __version__Adal Chiriliuc2014-10-102-0/+35
* | | Merge pull request #139 from c0nk/masterFeng Xiao2014-12-201-1/+2
|\ \ \ | |_|/ |/| |
| * | Improved little endian byte order detectionKal Conley2014-12-161-1/+2
|/ /
* | Merge pull request #136 from cfallin/ruby-proto3-onlyJoshua Haberman2014-12-121-0/+8
|\ \
| * | Support Ruby code generation only for proto3.Chris Fallin2014-12-121-0/+8
|/ /
* | Add missing header files in src/Makefile.amFeng Xiao2014-12-121-1/+3
* | Update ruby DIST_FILES.Feng Xiao2014-12-121-9/+16
* | Adds Travis Cl support to test the code automatically.Feng Xiao2014-12-122-0/+6
* | Merge pull request #134 from cfallin/masterJoshua Haberman2014-12-1220-62/+17557
|\ \
| * | Rename protobuf Ruby module to google/protobuf and rework its buildChris Fallin2014-12-1220-62/+17557
|/ /
* | Merge pull request #128 from krishnanm86/masterFeng Xiao2014-12-122-14/+14
|\ \
| * | Reverting the space at the end for both files changedKrishna2014-12-122-2/+2
| * | Reverting the space at the endKrishna2014-12-121-1/+1
| * | Returned print_indent and print_outdent back to printservicestub and printser...Krishna2014-12-121-5/+8
| * | Reverted changes to cpp_helpers.cc and made code reviews to python_geenerator.ccKrishna2014-12-113-22/+20
| * | Fixed bugsKrishna2014-12-103-5/+8
| * | Source code refactoring. Extracted common functionality in cpp_helpers.cc and...Krishna2014-12-102-26/+22
* | | Merge pull request #113 from nsuke/oneof-c++11Feng Xiao2014-12-115-41/+40
|\ \ \
| * | | Make C++ string oneof field compatible with C++11Nobuaki Sukegawa2014-12-032-3/+2
| * | | Display element name in test error logNobuaki Sukegawa2014-12-031-2/+2
| * | | Make test code runnable with C++11Nobuaki Sukegawa2014-12-033-37/+37
| |/ /
* | | Describe how to get gtest source for Visual Studio users.Feng Xiao2014-12-111-0/+7