aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | 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
| * | | | | Exclude pbconfg.h from dist, otherwise it breaks VS builds.Jisi Liu2015-02-251-3/+4
| * | | | | Merge pull request #221 from google/python_proto3Jisi Liu2015-02-2543-2099/+6234
| |\ \ \ \ \
| | * | | | | Fixes for Python/C++ implementation in open-source:Josh Haberman2015-02-2511-27/+490
| | * | | | | Down integrate from Google internal.Jisi Liu2015-02-2539-2087/+5759
| |/ / / / / |/| | | | |
* | | | | | Merge alpha branch 'review/v3.0.0-alpha-2'Jisi Liu2015-02-2320-633/+898
|\ \ \ \ \ \
| | * \ \ \ \ Merge "Update .gitignore so that the newly-added config.h is visible to git."...Jisi Liu2015-02-261-1/+1
| | |\ \ \ \ \
| | | * | | | | Update .gitignore so that the newly-added config.h is visible to git.Jisi Liu2015-02-251-1/+1
| | * | | | | | Include shared_ptr.h into headers to make maps proto work. It is usedJisi Liu2015-02-251-0/+1
| | * | | | | | Make maps fields work on installed C++ protobufs.Jisi Liu2015-02-258-25/+92
| | |/ / / / /
| | * / / / / Add unix tools instructions for Mac.Jisi Liu2015-02-241-0/+16
| |/ / / / /
| * | | | | Propogate onChange() event when getFooBuilder() is on an oneof messageJisi Liu2015-02-232-1/+14
| * | | | | Fix Java maps reflection to call onChange to populate changes to parentJisi Liu2015-02-232-89/+132
| * | | | | Updated Ruby README with more details on getting started.Chris Fallin2015-02-231-2/+45
| * | | | | Add JavaNano and Ruby protoc files into vs projJisi Liu2015-02-222-519/+539
| * | | | | Add shutdown code for several newly introduced leaks;Jisi Liu2015-02-214-1/+41
| * | | | | Include Ruby and JavaNano into dist packages.Jisi Liu2015-02-213-3/+43
| * | | | | Update version number to 3.0.0-alpha-2Jisi Liu2015-02-214-6/+6
| * | | | | Merge pull request #215 from cfallin/ruby-gem-versionChris Fallin2015-02-201-1/+1
| |\ \ \ \ \
| | * | | | | Update Ruby gem version to 3.0.0.alpha.2.0.Chris Fallin2015-02-201-1/+1
| * | | | | | Merge pull request #214 from cfallin/ruby-changelogChris Fallin2015-02-202-3/+27
| |\| | | | |
| | * | | | | Updated Ruby README.Chris Fallin2015-02-201-1/+0
| | * | | | | Updated CHANGES.txt to mention Ruby extension.Chris Fallin2015-02-201-2/+27
| |/ / / / /
| * / / / / Add changelog for 3.0.0-alpha2 release.Jisi Liu2015-02-202-10/+52
|/ / / / /
* / / / / Use static_cast instead of dynamic_cast in arena unittest so that it canJisi Liu2015-02-201-7/+6
|/ / / /
* | | | Add test for debug string for oneofJisi Liu2015-02-191-0/+2
* | | | Fix review comments.Jisi Liu2015-02-193-11/+12
* | | | Remove the unused set common oneof variables in helperJisi Liu2015-02-191-3/+0
* | | | Add tests for oneofs.Jisi Liu2015-02-191-6/+142
* | | | partial oneof tests.Jisi Liu2015-02-191-0/+38
* | | | fix equal and hash for bytes field for javanano oneofJisi Liu2015-02-194-22/+46
* | | | Add tests for oneof equals and hash.Jisi Liu2015-02-192-0/+81
* | | | Uncomment string/bytes fields in oneof nano.Jisi Liu2015-02-191-2/+2
* | | | Clear oneofs.Jisi Liu2015-02-191-0/+8
* | | | hashcode and equals for oneofs in nano.Jisi Liu2015-02-194-12/+34
* | | | Equals for message oneof field in nano.Jisi Liu2015-02-191-0/+10
* | | | Oneof message level elements (consts, case getter/clear) and messsage type fi...Jisi Liu2015-02-196-18/+106
* | | | Initial check-in for message oneof.Jisi Liu2015-02-193-3/+28
* | | | Initial check in for primitive oneof fields.Jisi Liu2015-02-198-4/+161
* | | | Support maps in NanoPrinter.Jisi Liu2015-02-192-0/+53
* | | | Merge pull request #213 from pherl/mapsChris Fallin2015-02-191-2/+1
|\ \ \ \
| * | | | Use EMPTY_BYTES in WireFormatNanoJisi Liu2015-02-191-2/+1
* | | | | Merge pull request #212 from haberman/update-from-googleChris Fallin2015-02-187-13/+33
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of github.com:google/protobufJosh Haberman2015-02-1754-461/+23717
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #204 from pherl/masterJisi Liu2015-02-1715-87/+1163
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Mark factory setter API as private for alpha release.Jisi Liu2015-02-171-1/+5
| * | | | | Merge the javanano map test into the main test target.Jisi Liu2015-02-091-4/+0
| * | | | | Add java compiled targets and several tests target into .gitignore.Jisi Liu2015-02-091-0/+11
| * | | | | Get the map factory per mergeFrom() call for JavaNano.Jisi Liu2015-02-075-2/+23