aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/
| * Merge pull request #499 from xfxyjwf/appveyorFeng Xiao2015-06-151-1/+1
| |\
| | * Add a badge for AppVeyor build.Feng Xiao2015-06-151-1/+1
| * | Merge pull request #488 from AustinSchuh/ruby_test_fixFeng Xiao2015-06-151-0/+4
| |\ \ | | |/ | |/|
| | * Modified FindRubyTestDir to use GOOGLE_THIRD_PARTY_PROTOBUFAustin Schuh2015-06-101-0/+4
| * | Merge pull request #498 from pherl/rmconfigJisi Liu2015-06-132-8/+0
| |\ \
| | * | Remove the file from Makefile.amJisi Liu2015-06-131-1/+0
| | * | Remove config.h.include which is no longer needed as pbconfig.h is not aJisi Liu2015-06-131-7/+0
| |/ /
| * | Merge pull request #495 from pherl/masterJisi Liu2015-06-133-19/+145
| |\ \
| | * | Make pbconfig.h independent of config.hJisi Liu2015-06-133-19/+145
| | |/
| * | Add appveyor.xml for windows tests.Feng Xiao2015-06-121-0/+33
| * | Merge pull request #481 from Qartar/masterFeng Xiao2015-06-124-15/+62
| |\ \
| | * | Workaround for MSVC's string literal compiler limit.Qartar2015-06-124-15/+62
| * | | Merge pull request #489 from tamird/go-package-descriptorFeng Xiao2015-06-122-3/+5
| |\ \ \ | | |_|/ | |/| |
| | * | Give descriptor.proto a go packageTamir Duberstein2015-06-122-3/+5
| |/ /
| * | Merge pull request #486 from thomasvl/assets_podspecJisi Liu2015-06-108-16/+16
| |\ \
| | * | Update podspec for files that can build now, rename assets to not need @ in t...Thomas Van Lenten2015-06-108-16/+16
| * | | Merge pull request #483 from thomasvl/fixup_travis_2Feng Xiao2015-06-102-7/+31
| |\ \ \
| | * | | Remove the OS X checks from travis.sh, instead use excludes to not fire up a ...Thomas Van Lenten2015-06-102-7/+31
| * | | | Merge pull request #477 from haberman/upbupdateJoshua Haberman2015-06-105-5482/+5855
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fixed compiler warnings and added -std=c99.Josh Haberman2015-06-092-10/+7
| | * | | Updated upb to latest version (C89).Josh Haberman2015-06-084-5473/+5849
| | |/ /
| * | | Merge pull request #484 from TeBoring/tempPaul Yang2015-06-091-1/+1
| |\ \ \
| | * | | Update version number of objective-c to 3.0.0-alpha-4-preBo Yang2015-06-091-1/+1
| * | | | Merge pull request #480 from thomasvl/objc_beta_dropPaul Yang2015-06-0994-8018/+6910
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Beta quality drop of Objective C Support.Thomas Van Lenten2015-06-0894-8018/+6910
| | | |/ | | |/|