aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix or delete old projects.Jon Skeet2015-06-2619-46509/+14
* Tests for FieldCodec, along with a fix.Jon Skeet2015-06-263-1/+151
* Generated code changes for previous commit.Jon Skeet2015-06-267-661/+7091
* Tweaks and more tests for mapsJon Skeet2015-06-269-32/+299
* Make map test keys even more different to avoid odd hash collisionsJon Skeet2015-06-251-8/+8
* Generated code changes due to map changes.Jon Skeet2015-06-256-69/+138
* More map tests, and various production code improvements.Jon Skeet2015-06-258-40/+492
* Generated map code.Jon Skeet2015-06-251-87/+592
* First pass at map support.Jon Skeet2015-06-2520-10/+913
* Get the Mono build script working again.Jon Skeet2015-06-253-13/+9
* Regenerated descriptor C++ codeJon Skeet2015-06-251-3/+2
* Revert the change to wire_format.h.Jon Skeet2015-06-245-4/+16
* Implement freezing for messages and repeated fields.Jon Skeet2015-06-2425-292/+1668
* Merge pull request #536 from jtattermusch/fix_appveyorJon Skeet2015-06-2433-295/+422
|\
| * Merge remote-tracking branch 'upstream/master' into fix_appveyorJan Tattermusch2015-06-2433-295/+422
|/|
| * Merge pull request #530 from haberman/updateupbJoshua Haberman2015-06-232-19/+54
| |\
| | * Update upb to fix two bugs in the Ruby library.Josh Haberman2015-06-222-19/+54
| |/
| * Fix appveyor tests.Feng Xiao2015-06-221-2/+2
| * Merge pull request #503 from thomasvl/add_nonnill_markupPaul Yang2015-06-1930-274/+366
| |\
| | * Add nonnil markup to ObjC library.Thomas Van Lenten2015-06-1630-274/+366
* | | Merge pull request #532 from jskeet/proto3-cloneJan Tattermusch2015-06-2323-151/+991
|\ \ \
| * | | Generated code changes from previous commit.Jon Skeet2015-06-236-66/+66
| * | | Implement requested changes for IMessage<T>Jon Skeet2015-06-232-5/+6
| * | | Implement Clone.Jon Skeet2015-06-2323-149/+988
|/ / /
* | | Merge pull request #515 from jskeet/proto3-onlyJan Tattermusch2015-06-19237-199324/+12288
|\ \ \ | |/ / |/| |
| * | Merge remote-tracking branch 'upstream/master' into proto3-onlyJon Skeet2015-06-19107-330/+28853
| |\ \ | |/ / |/| |
* | | Merge pull request #510 from pherl/bazelJisi Liu2015-06-182-95/+2
|\ \ \
| * | | Remove OUTS constants in BUILDJisi Liu2015-06-182-95/+2
|/ / /
* | | Merge pull request #509 from pherl/update_BUILDJisi Liu2015-06-181-2/+65
|\ \ \
| * | | Update BUILD for the recent json util change.Jisi Liu2015-06-181-2/+65
|/ / /
* | | Merge pull request #508 from pherl/nanfixJisi Liu2015-06-181-1/+1
|\ \ \
| * | | using ::isnan to avoid conflicts with std::isnan for C++11 build.Jisi Liu2015-06-181-1/+1
|/ / /
* | | Fix distcheck.Jisi Liu2015-06-181-1/+1
* | | Merge pull request #505 from pherl/bazelJisi Liu2015-06-185-122/+593
|\ \ \
| * | | Remove redundant includeJisi Liu2015-06-181-1/+0
| * | | Add Bazel BUILD for the project.Jisi Liu2015-06-173-49/+524
| * | | Move cmake/update_file_lists.sh preparing for bazel support.Jisi Liu2015-06-172-6/+4
* | | | Merge pull request #501 from xfxyjwf/downFeng Xiao2015-06-17103-207/+28289
|\ \ \ \ | |/ / / |/| | |
| * | | Fix broken builds.Feng Xiao2015-06-1732-136/+190
| * | | Down-integrate from internal code base.Feng Xiao2015-06-15101-198/+28226
| | |/ | |/|
| | * Update the readme to give more context of what's going on.Jon Skeet2015-06-191-14/+15
| | * Minor cleanup.Jon Skeet2015-06-1918-254/+256
| | * Use an empty array instead of a null reference for an empty repeated field.Jon Skeet2015-06-191-22/+10
| | * Use our "local" copy of Encoding.UTF8 in CodedInputStream too.Jon Skeet2015-06-173-7/+8
| | * Delete "lite" project and serialization project+codeJon Skeet2015-06-1746-61270/+0
| | * Regenerated files.Jon Skeet2015-06-171-3/+3
| | * Updates to handle use of cmake for Windows builds.Jon Skeet2015-06-173-8/+5
| | * Merged masterJon Skeet2015-06-17159-16792/+13554
| | |\ | |_|/ |/| |
* | | Merge pull request #497 from pherl/config_hJisi Liu2015-06-1613-156/+23
|\ \ \ | |/ / |/| |
| * | Make the code independent of config.hJisi Liu2015-06-1613-156/+23
|/ /