aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #201 from gordana-cmiljanovic-imgtec/mips-atomic-ops-fixFeng Xiao2015-02-121-2/+2
|\
| * MIPS: remove immediate constraint within CompareAndSwap.Gordana Cmiljanovic2015-02-091-2/+2
* | Merge pull request #203 from pherl/gitignoreChris Fallin2015-02-091-0/+11
|\ \ | |/ |/|
| * Add java compiled targets and several tests target into .gitignore.Jisi Liu2015-02-091-0/+11
* | Merge pull request #197 from nsuke/protoc-export-rubyChris Fallin2015-02-071-1/+2
|\ \
| * | Add missing LIBPROTOC_EXPORT to ruby generatorNobuaki Sukegawa2015-02-081-1/+2
|/ /
* | Merge pull request #189 from cfallin/update-ruby-upbJoshua Haberman2015-02-054-111/+565
|\ \
| * | README.md update for Ruby gem.Chris Fallin2015-02-051-7/+5
| * | Updated to latest upb and added test for JSON map operation.Chris Fallin2015-02-023-104/+560
* | | Merge pull request #190 from isaiah/to_aryChris Fallin2015-02-032-32/+30
|\ \ \
| * | | add #to_ary to RepeatedFieldIsaiah Peng2015-02-032-32/+30
* | | | Merge pull request #186 from ennerf/win32-msvc-fixFeng Xiao2015-02-022-2/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | removed accidental whitespaceFlorian Enner2015-02-021-1/+1
| * | | replaced type fix with the recommended wayFlorian Enner2015-01-311-8/+2
| * | | fixed MSVC compile errorFlorian Enner2015-01-311-0/+6
| * | | added missing ruby generator to msvc projectFlorian Enner2015-01-311-0/+8
| |/ /
* | | Merge pull request #168 from cfallin/ruby-oneofJoshua Haberman2015-02-0217-262/+2348
|\ \ \ | |/ / |/| |
| * | Updated based on code-review comments.Chris Fallin2015-02-021-2/+1
| * | Updated based on code-review comments.Chris Fallin2015-02-023-16/+51
| * | Addressed code-review comments.Chris Fallin2015-01-262-12/+26
| * | Addressed code-review comments.Chris Fallin2015-01-263-7/+12
| * | Ruby extension: added oneof accessor.Chris Fallin2015-01-143-1/+53
| * | Addressed code-review comments.Chris Fallin2015-01-145-59/+71
| * | Fix golden-file Ruby test to work with out-of-tree builds.Chris Fallin2015-01-142-34/+41
| * | Two tests for Ruby code generator:Chris Fallin2015-01-146-1/+328
| * | Support oneofs in the Ruby code generator.Chris Fallin2015-01-141-18/+46
| * | Support oneofs in MRI Ruby C extension.Chris Fallin2015-01-148-233/+1840
* | | Remove deleted files from Makefile.am.Feng Xiao2015-01-291-1/+0
| |/ |/|
* | Merge pull request #180 from ned14/masterFeng Xiao2015-01-271-1/+1
|\ \
| * | Fix illegal C++ use of reinterpret_cast<> to cast between nullptr_t and a poi...Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)2015-01-271-1/+1
| |/
* / Delete unused files.Feng Xiao2015-01-271-27/+0
|/
* Merge pull request #155 from cfallin/ruby-mapsJoshua Haberman2015-01-1312-582/+2599
|\
| * Line-wraps at 80 chars.Chris Fallin2015-01-131-13/+18
| * Addressed code-review comments.Chris Fallin2015-01-122-23/+14
| * Update upb amalgamation.Chris Fallin2015-01-092-400/+747
| * Addressed code-review comments.Chris Fallin2015-01-096-135/+72
| * Addressed code-review comments.Chris Fallin2015-01-066-32/+59
| * Support for maps in the MRI C Ruby extension.Chris Fallin2015-01-0612-163/+1873
* | 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
|/ /