aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Rewrote C# protogen to C++ (initial version)Jan Tattermusch2015-03-2636-49/+6640
* 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
* | | | Updated Ruby gem version and added note to ruby/README.md regarding version n...Chris Fallin2015-03-032-1/+25
* | | | Bump the version number to 3.0.0-alpha-3-preJisi Liu2015-03-025-7/+7
| |/ / |/| |
* | | Add .so to .gitignore.Jisi Liu2015-02-281-0/+1
* | | Merge pull request #185 from mzhaom/remove-unusedJisi Liu2015-02-262-26/+1
|\ \ \
| * | | Remove unused methods:Ming Zhao2015-01-292-26/+1
* | | | Merge pull request #199 from google/wktJisi Liu2015-02-266-0/+635
|\ \ \ \
| * | | | Add the .proto files for well-known types.Feng Xiao2015-02-096-0/+635
* | | | | Merge pull request #216 from cnauroth/Parser-JavaDocJisi Liu2015-02-261-2/+2
|\ \ \ \ \
| * | | | | Correct JavaDoc return value documentation for Parser#parseDelimitedFrom.cnauroth2015-02-231-2/+2
* | | | | | Merge pull request #222 from google/v3.0.0-alpha-2Jisi Liu2015-02-2652-2126/+6363
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | A few tweaks to CHANGES.txt.v3.0.0-alpha-2Josh Haberman2015-02-251-3/+3
| * | | | | Added release notes about Python changes.Josh Haberman2015-02-251-0/+17
| * | | | | Fix the order of BUILT_FILES so that pbconfig.h will be built beforeJisi Liu2015-02-251-1/+1