aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix broken builds.Feng Xiao2015-06-1732-136/+190
* Down-integrate from internal code base.Feng Xiao2015-06-15101-198/+28226
* 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
| | |/ | |/|
* | | Refactored threadlocal logic.Austin Schuh2015-06-085-9/+15
| |/ |/|
* | Exclude 3 failing tests on osx from travis.Feng Xiao2015-06-081-0/+8
* | Merge pull request #469 from xfxyjwf/vsprojectsFeng Xiao2015-06-0816-2963/+56
|\ \ | |/ |/|
| * Remove vsprojects.Feng Xiao2015-06-0516-2963/+56
* | Merge pull request #361 from brianduff/sync_aospFeng Xiao2015-06-061-12/+10
|\ \
| * | Speed up little endian int/long writes.Jeff Davidson2015-05-111-12/+10
* | | Merge pull request #468 from AustinSchuh/unsigned_protoFeng Xiao2015-06-063-19/+19
|\ \ \
| * | | Marked another compiler literal unsigned.Austin Schuh2015-06-053-19/+19
* | | | Merge pull request #467 from AustinSchuh/GOOGLE_PREDICT_FALSEFeng Xiao2015-06-061-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fixed bug in GOOGLE_PREDICT_FALSE.Austin Schuh2015-06-051-1/+1
| |/ /
* | | Update ./update_file_lists.sh.Feng Xiao2015-06-053-10/+127
* | | Add back incorrectly excluded cmake targets.Feng Xiao2015-06-051-1/+2
|/ /
* | Merge pull request #460 from haberman/conformance-namesJoshua Haberman2015-06-055-60/+235
|\ \
| * | Removed test_name from conformance.proto.Josh Haberman2015-06-044-15/+15
| * | Conformance tests can now be excluded based on their names.Josh Haberman2015-06-036-59/+234
* | | Merge pull request #462 from anandolee/masterJie Luo2015-06-0428-1647/+1861
|\ \ \
| * | | Migrate writer to io::Printer for C#Jie Luo2015-06-0428-1647/+1861
* | | | Merge pull request #457 from xfxyjwf/cmakeFeng Xiao2015-06-0412-11/+767
|\ \ \ \
| * | | | Fix README.md formatting.Feng Xiao2015-06-041-34/+43
| * | | | Add an cmake option to exclude tests.Feng Xiao2015-06-041-2/+4
| * | | | Add cmake support.Feng Xiao2015-05-3112-11/+756
* | | | | Merge pull request #456 from xfxyjwf/androidJisi Liu2015-06-042-494/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove Android.mkFeng Xiao2015-06-022-494/+0