aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Down-integrate from internal branch.Gravatar Jisi Liu2015-08-21
* Merge pull request #621 from nico/staticassGravatar Jisi Liu2015-07-20
|\
* \ Merge pull request #604 from haberman/ruby-conformanceGravatar Joshua Haberman2015-07-20
|\ \
| * | Fixed lint errors and responded to CR comments.Gravatar Josh Haberman2015-07-17
| * | Exclude JRuby from conformance tests for now.Gravatar Josh Haberman2015-07-17
* | | Merge pull request #622 from pherl/splitheadersGravatar Jisi Liu2015-07-17
|\ \ \
| * | | Addming missing includes in stubs headers.Gravatar Jisi Liu2015-07-17
| | | * Let GOOGLE_COMPILE_ASSERT use static_assert if available.Gravatar Nico Weber2015-07-17
| |_|/ |/| |
* | | Merge pull request #613 from pherl/splitheadersGravatar Jisi Liu2015-07-17
|\| |
* | | Merge pull request #601 from anandolee/masterGravatar Jie Luo2015-07-17
|\ \ \
| | * | update header list.Gravatar Jisi Liu2015-07-17
| | * | Merge branch 'master' of github.com:google/protobuf into splitheaderGravatar Jisi Liu2015-07-17
| | |\ \ | |_|/ / |/| | |
| | * | Update make file for extra headers.Gravatar Jisi Liu2015-07-17
| | * | Split up common.h headersGravatar Jisi Liu2015-07-16
| | | * Added Ruby to conformance tests.Gravatar Josh Haberman2015-07-16
| | |/
| * / ignore UTF-8 BOM if it is in the begining of a proto fileGravatar Jie Luo2015-07-16
| |/
* / Install missing headersGravatar Rob Earhart2015-07-14
|/
* Merge pull request #591 from pherl/fixbuildGravatar Jisi Liu2015-07-13
|\
| * remove pbconfig from extract scriptGravatar Jisi Liu2015-07-13
|/
* Merge pull request #588 from haberman/conformance-jsonGravatar Joshua Haberman2015-07-13
|\
| * Added support for Json and valid input to conformance tests.Gravatar Josh Haberman2015-07-10
|/
* Merge pull request #570 from google/internal-third-partyGravatar Paul Yang2015-07-09
|\
| * Internal local modifications.Gravatar Bo Yang2015-07-09
|/
* Merge pull request #575 from haberman/rbleakGravatar Joshua Haberman2015-07-08
|\
| * Worked around memory leak bug in Ruby interpreter.Gravatar Josh Haberman2015-07-08
|/
* Merge pull request #554 from jcanizales/proto-objc-bazelGravatar Paul Yang2015-07-06
|\
| * Add Bazel target for protobuf ObjC runtimeGravatar Jorge Canizales2015-07-06
* | Merge pull request #500 from TeBoring/tempGravatar Paul Yang2015-07-01
|\ \
* \ \ Merge pull request #551 from ostrovsky/masterGravatar Feng Xiao2015-07-01
|\ \ \
| * | | MinGW64+MSYS2 compilation issues and portable isnan using MathLimitsGravatar Karol Ostrovsky2015-07-01
| | |/ | |/|
* | | Merge pull request #458 from xfxyjwf/memory_leakGravatar Paul Yang2015-06-30
|\ \ \
* \ \ \ Merge pull request #556 from mgiuca/fix-clang-warningGravatar Feng Xiao2015-06-30
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix "sometimes-uninitialized" warning on Windows Clang.Gravatar Matt Giuca2015-06-30
|/ / /
* | | Merge pull request #540 from pherl/clean-warningsGravatar Jisi Liu2015-06-25
|\ \ \
* \ \ \ Merge pull request #512 from pherl/bazelGravatar Paul Yang2015-06-24
|\ \ \ \
| | * | | fix compiler warnings.Gravatar Jisi Liu2015-06-24
* | | | | Merge pull request #538 from google/jtattermusch-patch-1Gravatar Jisi Liu2015-06-24
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix typo in cmake/README.mdGravatar Jan Tattermusch2015-06-24
|/ / / /
* | | | Merge pull request #530 from haberman/updateupbGravatar Joshua Haberman2015-06-23
|\ \ \ \
| * | | | Update upb to fix two bugs in the Ruby library.Gravatar Josh Haberman2015-06-22
|/ / / /
* | | | Fix appveyor tests.Gravatar Feng Xiao2015-06-22
* | | | Merge pull request #503 from thomasvl/add_nonnill_markupGravatar Paul Yang2015-06-19
|\ \ \ \
| | * | | Enable tests for bazel build.Gravatar Jisi Liu2015-06-18
| |/ / / |/| | |
* | | | Merge pull request #510 from pherl/bazelGravatar Jisi Liu2015-06-18
|\ \ \ \
| * | | | Remove OUTS constants in BUILDGravatar Jisi Liu2015-06-18
|/ / / /
* | | | Merge pull request #509 from pherl/update_BUILDGravatar Jisi Liu2015-06-18
|\ \ \ \
| * | | | Update BUILD for the recent json util change.Gravatar Jisi Liu2015-06-18
|/ / / /
* | | | Merge pull request #508 from pherl/nanfixGravatar Jisi Liu2015-06-18
|\ \ \ \
| * | | | using ::isnan to avoid conflicts with std::isnan for C++11 build.Gravatar Jisi Liu2015-06-18
|/ / / /
* | | | Fix distcheck.Gravatar Jisi Liu2015-06-18