aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #591 from pherl/fixbuildJisi Liu2015-07-131-1/+0
|\
| * remove pbconfig from extract scriptJisi Liu2015-07-131-1/+0
|/
* Merge pull request #588 from haberman/conformance-jsonJoshua Haberman2015-07-136-52/+263
|\
| * Added support for Json and valid input to conformance tests.Josh Haberman2015-07-106-52/+263
|/
* Merge pull request #570 from google/internal-third-partyPaul Yang2015-07-0911-158/+167
|\
| * Internal local modifications.Bo Yang2015-07-0911-158/+167
|/
* Merge pull request #575 from haberman/rbleakJoshua Haberman2015-07-081-1/+13
|\
| * Worked around memory leak bug in Ruby interpreter.Josh Haberman2015-07-081-1/+13
|/
* Merge pull request #554 from jcanizales/proto-objc-bazelPaul Yang2015-07-063-35/+50
|\
| * Add Bazel target for protobuf ObjC runtimeJorge Canizales2015-07-063-35/+50
* | Merge pull request #500 from TeBoring/tempPaul Yang2015-07-013-62/+94
|\ \
| * | Implement parsing for proto3 primitive repeated fields. Previously, forBo Yang2015-06-153-62/+94
* | | Merge pull request #551 from ostrovsky/masterFeng Xiao2015-07-016-31/+21
|\ \ \
| * | | MinGW64+MSYS2 compilation issues and portable isnan using MathLimitsKarol Ostrovsky2015-07-016-31/+21
| | |/ | |/|
* | | Merge pull request #458 from xfxyjwf/memory_leakPaul Yang2015-06-301-0/+5
|\ \ \
| * | | Delete default UnknownFieldSet when shuting down.Feng Xiao2015-06-021-0/+5
* | | | Merge pull request #556 from mgiuca/fix-clang-warningFeng Xiao2015-06-301-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix "sometimes-uninitialized" warning on Windows Clang.Matt Giuca2015-06-301-1/+1
|/ / /
* | | Merge pull request #540 from pherl/clean-warningsJisi Liu2015-06-253-11/+6
|\ \ \
| * | | fix compiler warnings.Jisi Liu2015-06-243-11/+6
* | | | Merge pull request #512 from pherl/bazelPaul Yang2015-06-244-77/+140
|\ \ \ \
| * | | | Enable tests for bazel build.Jisi Liu2015-06-184-77/+140
* | | | | Merge pull request #538 from google/jtattermusch-patch-1Jisi Liu2015-06-241-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix typo in cmake/README.mdJan Tattermusch2015-06-241-1/+1
|/ / / /
* | | | Merge pull request #530 from haberman/updateupbJoshua Haberman2015-06-232-19/+54
|\ \ \ \
| * | | | Update upb to fix two bugs in the Ruby library.Josh Haberman2015-06-222-19/+54
|/ / / /
* | | | Fix appveyor tests.Feng Xiao2015-06-221-2/+2
* | | | Merge pull request #503 from thomasvl/add_nonnill_markupPaul Yang2015-06-1930-274/+366
|\ \ \ \ | |/ / / |/| | |
| * | | Add nonnil markup to ObjC library.Thomas Van Lenten2015-06-1630-274/+366
| | |/ | |/|
* | | 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
| |/ /
* | | 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
|\ \ \