Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #512 from pherl/bazel | Paul Yang | 2015-06-24 | 4 | -77/+140 | |
|\ \ \ \ | ||||||
| * | | | | Enable tests for bazel build. | Jisi Liu | 2015-06-18 | 4 | -77/+140 | |
* | | | | | Merge pull request #538 from google/jtattermusch-patch-1 | Jisi Liu | 2015-06-24 | 1 | -1/+1 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | fix typo in cmake/README.md | Jan Tattermusch | 2015-06-24 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #530 from haberman/updateupb | Joshua Haberman | 2015-06-23 | 2 | -19/+54 | |
|\ \ \ \ | ||||||
| * | | | | Update upb to fix two bugs in the Ruby library. | Josh Haberman | 2015-06-22 | 2 | -19/+54 | |
|/ / / / | ||||||
* | | | | Fix appveyor tests. | Feng Xiao | 2015-06-22 | 1 | -2/+2 | |
* | | | | Merge pull request #503 from thomasvl/add_nonnill_markup | Paul Yang | 2015-06-19 | 30 | -274/+366 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Add nonnil markup to ObjC library. | Thomas Van Lenten | 2015-06-16 | 30 | -274/+366 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #510 from pherl/bazel | Jisi Liu | 2015-06-18 | 2 | -95/+2 | |
|\ \ \ | ||||||
| * | | | Remove OUTS constants in BUILD | Jisi Liu | 2015-06-18 | 2 | -95/+2 | |
|/ / / | ||||||
* | | | Merge pull request #509 from pherl/update_BUILD | Jisi Liu | 2015-06-18 | 1 | -2/+65 | |
|\ \ \ | ||||||
| * | | | Update BUILD for the recent json util change. | Jisi Liu | 2015-06-18 | 1 | -2/+65 | |
|/ / / | ||||||
* | | | Merge pull request #508 from pherl/nanfix | Jisi Liu | 2015-06-18 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | using ::isnan to avoid conflicts with std::isnan for C++11 build. | Jisi Liu | 2015-06-18 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Fix distcheck. | Jisi Liu | 2015-06-18 | 1 | -1/+1 | |
* | | | Merge pull request #505 from pherl/bazel | Jisi Liu | 2015-06-18 | 5 | -122/+593 | |
|\ \ \ | ||||||
| * | | | Remove redundant include | Jisi Liu | 2015-06-18 | 1 | -1/+0 | |
| * | | | Add Bazel BUILD for the project. | Jisi Liu | 2015-06-17 | 3 | -49/+524 | |
| * | | | Move cmake/update_file_lists.sh preparing for bazel support. | Jisi Liu | 2015-06-17 | 2 | -6/+4 | |
* | | | | Merge pull request #501 from xfxyjwf/down | Feng Xiao | 2015-06-17 | 103 | -207/+28289 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Fix broken builds. | Feng Xiao | 2015-06-17 | 32 | -136/+190 | |
| * | | | Down-integrate from internal code base. | Feng Xiao | 2015-06-15 | 101 | -198/+28226 | |
| |/ / | ||||||
* | | | Merge pull request #497 from pherl/config_h | Jisi Liu | 2015-06-16 | 13 | -156/+23 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Make the code independent of config.h | Jisi Liu | 2015-06-16 | 13 | -156/+23 | |
|/ / | ||||||
* | | Merge pull request #499 from xfxyjwf/appveyor | Feng Xiao | 2015-06-15 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | Add a badge for AppVeyor build. | Feng Xiao | 2015-06-15 | 1 | -1/+1 | |
* | | | Merge pull request #488 from AustinSchuh/ruby_test_fix | Feng Xiao | 2015-06-15 | 1 | -0/+4 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Modified FindRubyTestDir to use GOOGLE_THIRD_PARTY_PROTOBUF | Austin Schuh | 2015-06-10 | 1 | -0/+4 | |
* | | | Merge pull request #498 from pherl/rmconfig | Jisi Liu | 2015-06-13 | 2 | -8/+0 | |
|\ \ \ | ||||||
| * | | | Remove the file from Makefile.am | Jisi Liu | 2015-06-13 | 1 | -1/+0 | |
| * | | | Remove config.h.include which is no longer needed as pbconfig.h is not a | Jisi Liu | 2015-06-13 | 1 | -7/+0 | |
|/ / / | ||||||
* | | | 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 | |
| | |/ / | |/| | |