aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rename persons to peopleJan Tattermusch2015-07-207-8/+8
* use Google.Protobuf namespace for C#Jan Tattermusch2015-07-201-1/+1
* fixed java exampleJan Tattermusch2015-07-202-5/+5
* fix python exampleJan Tattermusch2015-07-202-5/+5
* fix C++ exampleJan Tattermusch2015-07-202-7/+7
* update addressbook.proto to proto3Jan Tattermusch2015-07-201-8/+8
* Merge pull request #604 from haberman/ruby-conformanceJoshua Haberman2015-07-2016-579/+694
|\
| * Fixed lint errors and responded to CR comments.Josh Haberman2015-07-172-27/+30
| * Exclude JRuby from conformance tests for now.Josh Haberman2015-07-171-7/+16
| * Added Ruby to conformance tests.Josh Haberman2015-07-1616-575/+678
* | Merge pull request #622 from pherl/splitheadersJisi Liu2015-07-172-0/+2
|\ \
| * | Addming missing includes in stubs headers.Jisi Liu2015-07-172-0/+2
* | | Merge pull request #613 from pherl/splitheadersJisi Liu2015-07-1710-1404/+1640
|\| |
| * | update header list.Jisi Liu2015-07-171-0/+3
| * | Merge branch 'master' of github.com:google/protobuf into splitheaderJisi Liu2015-07-171-0/+3
| |\ \
| * | | Update make file for extra headers.Jisi Liu2015-07-172-0/+12
| * | | Split up common.h headersJisi Liu2015-07-168-1404/+1625
| | |/ | |/|
* | | Merge pull request #601 from anandolee/masterJie Luo2015-07-172-0/+35
|\ \ \ | |_|/ |/| |
| * | ignore UTF-8 BOM if it is in the begining of a proto fileJie Luo2015-07-162-0/+35
| |/
* / Install missing headersRob Earhart2015-07-141-0/+3
|/
* 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
|\ \ \