aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'origin/3.4.x' into mergemasterJisi Liu2017-08-18179-7262/+12264
|\ \ \ | |/ / |/| / | |/
| * Fix cmath/math.h include with non C++11 libstdc++Jisi Liu2017-08-151-6/+11
| * Merge pull request #3485 from pherl/mingwv3.4.0rc3Jisi Liu2017-08-1113-15/+44
| |\
| | * Fix commentsJisi Liu2017-08-112-1/+2
| | * Add malloc castJisi Liu2017-08-111-2/+2
| | * implement remove strdup usage and implement our ownJisi Liu2017-08-111-2/+12
| | * Adding missing imports for strdupJisi Liu2017-08-111-0/+1
| | * Fix mkdirJisi Liu2017-08-111-2/+6
| | * Make win32_io only for MSVCJisi Liu2017-08-1112-12/+22
| | * Fix the declaration order in ming32Jisi Liu2017-08-111-5/+5
| | * Fixing io_win32 for MinGW32Jisi Liu2017-08-111-0/+3
| * | Make compilers without ref-qualifier support happy.Jisi Liu2017-08-111-2/+4
| |/
| * Make no warning test stricter.Jisi Liu2017-08-101-12/+7
| * Make code free of missing-field-initializers warningsv3.4.0rc2Jisi Liu2017-08-0916-61/+64
| * Merge branch 'master' into 3.4.xBo Yang2017-08-052-0/+2
| |\
| * | Fix invalid offsetof warning.Jisi Liu2017-08-0315-144/+315
| * | Add destructors for default instances to the shutdown code.Gerben Stavenga2017-08-0216-73/+152
| * | Adding the missing headerJisi Liu2017-08-011-0/+1
| * | Export functions in io_win32.h in win DLL buildJisi Liu2017-08-011-13/+14
| * | Fix makefile.amJisi Liu2017-07-251-0/+3
| * | Fix build filesJisi Liu2017-07-251-0/+3
| * | Merge remote-tracking branch 'origin/master' into mergeJisi Liu2017-07-252-2/+3
| |\ \
| * | | Merge from masterJisi Liu2017-07-2533-89/+1276
| * | | Merge remote-tracking branch 'origin/3.4.x' into vbJisi Liu2017-07-241-22/+32
| |\ \ \
| | * | | Omit the zip test if tools are not availableJisi Liu2017-07-241-22/+32
| * | | | Update required version on pre-generated filesJisi Liu2017-07-2412-12/+12
| * | | | Update pre generated filesJisi Liu2017-07-2412-12/+12
| * | | | Update version number for 3.4.0Jisi Liu2017-07-242-8/+8
| |/ / /
| * | | Fix distcheckJisi Liu2017-07-191-0/+1
| * | | remove profileJisi Liu2017-07-193-2238/+0
| * | | Merge master into 3.4.xJisi Liu2017-07-1884-1014/+1728
| |\ \ \
| * | | | Merge from Google internal for 3.4 releaseJisi Liu2017-07-18169-4951/+11729
* | | | | Fixing warning under Clang 6.x (-Wexpansion-to-defined) where the macro expan...drivehappy2017-08-151-2/+5
* | | | | Clean up typedefs for Atomic32/Atomic64Brad Larson2017-08-101-21/+14
| |_|_|/ |/| | |
* | | | Add a objc_class_prefix to test_messages_proto3.proto.Thomas Van Lenten2017-07-261-0/+1
* | | | Merge pull request #3410 from adam-26/1745Adam Cozzette2017-07-251-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix quotation marksAdam2017-07-241-1/+1
| * | | Fix issue #1745 - javascript allow dot in filenameAdam2017-07-241-0/+1
* | | | Merge pull request #3407 from bklarson/masterAdam Cozzette2017-07-2515-1/+29
|\ \ \ \
| * | | | Put AddDescriptorsImpl() in anonymous namespaceBrad Larson2017-07-2414-0/+28
| * | | | Add -Werror=missing-declarations to test buildsBrad Larson2017-07-241-1/+1
* | | | | Merge pull request #3281 from BSBandme/ConformanceTestYilunChongYilun Chong2017-07-242-3/+219
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch 'master' into ConformanceTestYilunChongYilun Chong2017-06-3040-819/+968
| |\ \ \ \
| * | | | | add some test proto2 supported, add js proto2 supported, fixed some errorYilun Chong2017-06-302-4/+4
| * | | | | change php objc nodejs csharp rubyYilun Chong2017-06-291-7/+7
| * | | | | add message set test caseYilun Chong2017-06-281-0/+20
| * | | | | add support for proto2Yilun Chong2017-06-261-4/+4
| * | | | | add test_proto2_message.proto and change conformnace/makefile.amYilun Chong2017-06-231-0/+196
* | | | | | Merge pull request #2969 from laszlocsomor/masterFeng Xiao2017-07-2414-81/+950
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Windows: support long pathsLaszlo Csomor2017-07-1114-81/+950