aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #604 from haberman/ruby-conformanceJoshua Haberman2015-07-202-16/+24
|\
| * Added Ruby to conformance tests.Josh Haberman2015-07-162-16/+24
* | 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-179-1404/+1631
|\| |
| * | Merge branch 'master' of github.com:google/protobuf into splitheaderJisi Liu2015-07-171-0/+3
| |\ \
| * | | Update make file for extra headers.Jisi Liu2015-07-171-0/+6
| * | | 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
|/
* Internal local modifications.Bo Yang2015-07-0910-158/+160
* 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
* | | | Fix "sometimes-uninitialized" warning on Windows Clang.Matt Giuca2015-06-301-1/+1
| |/ / |/| |
* | | fix compiler warnings.Jisi Liu2015-06-243-11/+6
* | | Merge pull request #503 from thomasvl/add_nonnill_markupPaul Yang2015-06-192-9/+13
|\ \ \
| * | | Add nonnil markup to ObjC library.Thomas Van Lenten2015-06-162-9/+13
| | |/ | |/|
* | | using ::isnan to avoid conflicts with std::isnan for C++11 build.Jisi Liu2015-06-181-1/+1
* | | Merge pull request #501 from xfxyjwf/downFeng Xiao2015-06-1792-154/+28178
|\ \ \
| * | | Fix broken builds.Feng Xiao2015-06-1726-128/+170
| * | | Down-integrate from internal code base.Feng Xiao2015-06-1592-150/+28132
| |/ /
* / / Make the code independent of config.hJisi Liu2015-06-167-14/+10
|/ /
* | 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 #495 from pherl/masterJisi Liu2015-06-132-18/+145
|\ \ \
| * | | Make pbconfig.h independent of config.hJisi Liu2015-06-132-18/+145
| |/ /
* | | Merge pull request #481 from Qartar/masterFeng Xiao2015-06-123-15/+61
|\ \ \
| * | | Workaround for MSVC's string literal compiler limit.Qartar2015-06-123-15/+61
* | | | Give descriptor.proto a go packageTamir Duberstein2015-06-122-3/+5
| |/ / |/| |
* | | Merge pull request #480 from thomasvl/objc_beta_dropPaul Yang2015-06-0914-554/+355
|\ \ \
| * | | Beta quality drop of Objective C Support.Thomas Van Lenten2015-06-0814-554/+355
| |/ /
* / / Refactored threadlocal logic.Austin Schuh2015-06-085-9/+15
|/ /
* | Merge pull request #468 from AustinSchuh/unsigned_protoFeng Xiao2015-06-063-19/+19
|\ \
| * | Marked another compiler literal unsigned.Austin Schuh2015-06-053-19/+19
* | | Fixed bug in GOOGLE_PREDICT_FALSE.Austin Schuh2015-06-051-1/+1
|/ /
* | Merge pull request #462 from anandolee/masterJie Luo2015-06-0425-1632/+1846
|\ \
| * | Migrate writer to io::Printer for C#Jie Luo2015-06-0425-1632/+1846
* | | Merge pull request #457 from xfxyjwf/cmakeFeng Xiao2015-06-041-11/+8
|\ \ \
| * | | Add cmake support.Feng Xiao2015-05-311-11/+8
* | | | Merge pull request #453 from bakineggs/masterFeng Xiao2015-06-031-0/+14
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add protoc path detection for Mac OSDan Barry2015-06-021-0/+14
* | | | Merge pull request #444 from xfxyjwf/vs2010_fixFeng Xiao2015-06-022-9/+9
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Call copy() only if there is something to copy.Feng Xiao2015-05-311-1/+3
| * | Fix MapAllocator::destroy() bug.Feng Xiao2015-05-311-8/+6
* | | Merge pull request #305 from ezegomez/masterFeng Xiao2015-06-021-1/+1
|\ \ \