Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #495 from pherl/master | Jisi Liu | 2015-06-13 | 3 | -19/+145 |
|\ | |||||
| * | Make pbconfig.h independent of config.h | Jisi Liu | 2015-06-13 | 3 | -19/+145 |
* | | Add appveyor.xml for windows tests. | Feng Xiao | 2015-06-12 | 1 | -0/+33 |
* | | Merge pull request #481 from Qartar/master | Feng Xiao | 2015-06-12 | 4 | -15/+62 |
|\ \ | |||||
| * | | Workaround for MSVC's string literal compiler limit. | Qartar | 2015-06-12 | 4 | -15/+62 |
* | | | Merge pull request #489 from tamird/go-package-descriptor | Feng Xiao | 2015-06-12 | 2 | -3/+5 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Give descriptor.proto a go package | Tamir Duberstein | 2015-06-12 | 2 | -3/+5 |
|/ / | |||||
* | | Merge pull request #486 from thomasvl/assets_podspec | Jisi Liu | 2015-06-10 | 8 | -16/+16 |
|\ \ | |||||
| * | | Update podspec for files that can build now, rename assets to not need @ in t... | Thomas Van Lenten | 2015-06-10 | 8 | -16/+16 |
* | | | Merge pull request #483 from thomasvl/fixup_travis_2 | Feng Xiao | 2015-06-10 | 2 | -7/+31 |
|\ \ \ | |||||
| * | | | Remove the OS X checks from travis.sh, instead use excludes to not fire up a ... | Thomas Van Lenten | 2015-06-10 | 2 | -7/+31 |
* | | | | Merge pull request #477 from haberman/upbupdate | Joshua Haberman | 2015-06-10 | 5 | -5482/+5855 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Fixed compiler warnings and added -std=c99. | Josh Haberman | 2015-06-09 | 2 | -10/+7 |
| * | | | Updated upb to latest version (C89). | Josh Haberman | 2015-06-08 | 4 | -5473/+5849 |
| |/ / | |||||
* | | | Merge pull request #484 from TeBoring/temp | Paul Yang | 2015-06-09 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Update version number of objective-c to 3.0.0-alpha-4-pre | Bo Yang | 2015-06-09 | 1 | -1/+1 |
* | | | | Merge pull request #480 from thomasvl/objc_beta_drop | Paul Yang | 2015-06-09 | 94 | -8018/+6910 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Beta quality drop of Objective C Support. | Thomas Van Lenten | 2015-06-08 | 94 | -8018/+6910 |
| | |/ | |/| | |||||
* | | | Refactored threadlocal logic. | Austin Schuh | 2015-06-08 | 5 | -9/+15 |
| |/ |/| | |||||
* | | Exclude 3 failing tests on osx from travis. | Feng Xiao | 2015-06-08 | 1 | -0/+8 |
* | | Merge pull request #469 from xfxyjwf/vsprojects | Feng Xiao | 2015-06-08 | 16 | -2963/+56 |
|\ \ | |/ |/| | |||||
| * | Remove vsprojects. | Feng Xiao | 2015-06-05 | 16 | -2963/+56 |
* | | Merge pull request #361 from brianduff/sync_aosp | Feng Xiao | 2015-06-06 | 1 | -12/+10 |
|\ \ | |||||
| * | | Speed up little endian int/long writes. | Jeff Davidson | 2015-05-11 | 1 | -12/+10 |
* | | | Merge pull request #468 from AustinSchuh/unsigned_proto | Feng Xiao | 2015-06-06 | 3 | -19/+19 |
|\ \ \ | |||||
| * | | | Marked another compiler literal unsigned. | Austin Schuh | 2015-06-05 | 3 | -19/+19 |
* | | | | Merge pull request #467 from AustinSchuh/GOOGLE_PREDICT_FALSE | Feng Xiao | 2015-06-06 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Fixed bug in GOOGLE_PREDICT_FALSE. | Austin Schuh | 2015-06-05 | 1 | -1/+1 |
| |/ / | |||||
* | | | Update ./update_file_lists.sh. | Feng Xiao | 2015-06-05 | 3 | -10/+127 |
* | | | Add back incorrectly excluded cmake targets. | Feng Xiao | 2015-06-05 | 1 | -1/+2 |
|/ / | |||||
* | | Merge pull request #460 from haberman/conformance-names | Joshua Haberman | 2015-06-05 | 5 | -60/+235 |
|\ \ | |||||
| * | | Removed test_name from conformance.proto. | Josh Haberman | 2015-06-04 | 4 | -15/+15 |
| * | | Conformance tests can now be excluded based on their names. | Josh Haberman | 2015-06-03 | 6 | -59/+234 |
* | | | Merge pull request #462 from anandolee/master | Jie Luo | 2015-06-04 | 28 | -1647/+1861 |
|\ \ \ | |||||
| * | | | Migrate writer to io::Printer for C# | Jie Luo | 2015-06-04 | 28 | -1647/+1861 |
* | | | | Merge pull request #457 from xfxyjwf/cmake | Feng Xiao | 2015-06-04 | 12 | -11/+767 |
|\ \ \ \ | |||||
| * | | | | Fix README.md formatting. | Feng Xiao | 2015-06-04 | 1 | -34/+43 |
| * | | | | Add an cmake option to exclude tests. | Feng Xiao | 2015-06-04 | 1 | -2/+4 |
| * | | | | Add cmake support. | Feng Xiao | 2015-05-31 | 12 | -11/+756 |
* | | | | | Merge pull request #456 from xfxyjwf/android | Jisi Liu | 2015-06-04 | 2 | -494/+0 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Remove Android.mk | Feng Xiao | 2015-06-02 | 2 | -494/+0 |
* | | | | | Merge pull request #453 from bakineggs/master | Feng Xiao | 2015-06-03 | 1 | -0/+14 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add protoc path detection for Mac OS | Dan Barry | 2015-06-02 | 1 | -0/+14 |
* | | | | | Merge pull request #444 from xfxyjwf/vs2010_fix | Feng Xiao | 2015-06-02 | 2 | -9/+9 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Call copy() only if there is something to copy. | Feng Xiao | 2015-05-31 | 1 | -1/+3 |
| * | | | Fix MapAllocator::destroy() bug. | Feng Xiao | 2015-05-31 | 1 | -8/+6 |
* | | | | Merge pull request #447 from murgatroid99/podspec_fix | Paul Yang | 2015-06-02 | 1 | -8/+19 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #1 from jcanizales/podspec_fix | Michael Lumish | 2015-06-02 | 1 | -7/+19 |
| |\ \ \ \ | |||||
| | * | | | | Reorder fields so it looks like exclude_files affects preserve_paths | Jorge Canizales | 2015-06-02 | 1 | -4/+4 |
| | * | | | | Better documentation | Jorge Canizales | 2015-06-02 | 1 | -4/+4 |