aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #257 from kentonv/masterJoshua Haberman2015-03-261-240/+0
|\
| * Delete "SEBS" (aka: Clean up Kenton's old trash)Kenton Varda2015-03-261-240/+0
|/
* Merge the release branch for v2.4.1Feng Xiao2015-03-240-0/+0
|\
| * Update version number to 2.4.1v2.4.1Feng Xiao2015-03-243-3/+3
* | Merge the release branch for v2.5.0Feng Xiao2015-03-240-0/+0
|\ \
| * | Update version number to 2.5.0v2.5.0Feng Xiao2015-03-244-5/+5
* | | Merge pull request #245 from numberten/patch-1Jisi Liu2015-03-184-32/+62
|\ \ \
| * | | converted javanano README to markdown. Corrected Makefilejesse2015-03-172-25/+44
| * | | rename python README, and fix markdown in java and python respectivelyjesse2015-03-162-7/+18
| * | | Rename README.txt to README.mdJesse Frankley2015-03-161-0/+0
* | | | Merge pull request #248 from tamird/test-on-osxFeng Xiao2015-03-182-2/+6
|\ \ \ \
| * | | | Parallelize CITamir Duberstein2015-03-181-1/+1
| * | | | Use Travis container-based buildsTamir Duberstein2015-03-181-0/+1
| * | | | Add OS X to travis; fix tests to pass on OS XTamir Duberstein2015-03-182-1/+4
|/ / / /
* | | | Merge pull request #228 from cconroy/sanitize-enumsJisi Liu2015-03-165-5/+50
|\ \ \ \ | |/ / / |/| | |
| * | | Sanitize Enum names from collisions with reserved words.Chris Conroy2015-03-165-5/+50
* | | | Merge pull request #244 from TeBoring/teboringPaul Yang2015-03-154-83/+0
|\ \ \ \
| * | | | Revert pull request 175: Add support for the TILE-Gx processor family.Bo Yang2015-03-144-83/+0
|/ / / /
* | | | Add a missing proto file.Feng Xiao2015-03-132-1/+47
* | | | Merge pull request #146 from isaiah/jrubyChris Fallin2015-03-1028-25/+4641
|\ \ \ \
| * | | | add jruby support by protobuf-java reflection APIIsaiah Peng2015-03-1028-25/+4641
|/ / / /
* | | | Merge pull request #193 from TeBoring/sbPaul Yang2015-03-095-2/+215
|\ \ \ \
| * | | | Fix absolute/relative path in outputBo Yang2015-02-092-12/+16
| * | | | Change target to output filenamesBo Yang2015-02-073-25/+73
| * | | | Fix commentBo Yang2015-02-041-2/+2
| * | | | Clean codeBo Yang2015-02-042-20/+20
| * | | | Remove "include sstream" from command_line_interface.ccBo Yang2015-02-041-1/+0
| * | | | Change flag for generating dependency file to "dependency_out". DeleteBo Yang2015-02-044-150/+12
| * | | | Fix comments.Bo Yang2015-02-031-2/+2
| * | | | Implement a feature to generate a dependency file. By giving protoc the flagBo Yang2015-02-036-34/+115
| * | | | Add support for outputting dependency manifest files, used by ninja and makeRichard Geary2015-01-233-0/+219
* | | | | Merge pull request #231 from google/alpha-2-fixChris Fallin2015-03-051-0/+60
|\ \ \ \ \
| * | | | | Add maven release profile for JavaNano.Jisi Liu2015-03-051-0/+60
* | | | | | Fix tile atomicops macro.Jisi Liu2015-03-051-6/+6
* | | | | | Merge pull request #175 from martiert/tile-supportJisi Liu2015-03-054-0/+83
|\ \ \ \ \ \
| * | | | | | Add support for the TILE-Gx processor family.Martin Ertsaas2015-01-224-0/+83
| | |/ / / / | |/| | | |
* | | | | | Fix python versions to comply with pep-0440.Jisi Liu2015-03-042-2/+14
| |_|/ / / |/| | | |
* | | | | Merge remote-tracking branch 'github/alpha-2-fix'Jisi Liu2015-03-041-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix python package version to alpha-2.Jisi Liu2015-03-041-1/+1
* | | | | Merge pull request #225 from google/post-alpha2-integrateJisi Liu2015-03-03147-3306/+11280
|\ \ \ \ \
| * | | | | Remove the extra -j8 as it can be passed in $@ already.Jisi Liu2015-03-021-1/+1
| * | | | | Initialize data members in constructors instead of direct initialize inJisi Liu2015-03-011-3/+3
| * | | | | use is_proto_enum instead of is_enum for repeated accessor field.Jisi Liu2015-03-011-1/+1
| * | | | | Fix hash.h for MSVC and platforms without hash map/set support.Jisi Liu2015-03-013-43/+48
| * | | | | Fix hash_map type parameter to add Alloc for other platforms.Jisi Liu2015-03-011-4/+6
| * | | | | Use portable GOOGLE_PROTOBUF_THREAD_LOCAL instead of __thread.Jisi Liu2015-03-012-2/+2
| * | | | | Add missing files in vsprojects.Jisi Liu2015-03-015-8/+49
| * | | | | Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-28140-3257/+11183
* | | | | | Merge "Add a release profile for Java mvn project, which includes source file...Jisi Liu2015-03-041-0/+58
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Add a release profile for Java mvn project, which includes source file,Jisi Liu2015-03-031-0/+58
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-15 14:53:59 +0000