aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Disable the xctool updatesThomas Van Lenten2016-02-182-8/+8
|/ / / /
* | | | Merge pull request #1239 from jskeet/call_generate_protosJon Skeet2016-02-182-1/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Generate C# code whenever descriptor.proto changesJon Skeet2016-02-152-1/+6
| |/ /
* | | Merge pull request #1229 from keveman/unlimited_binary_protoJoshua Haberman2016-02-172-4/+23
|\ \ \
| * | | Added PROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS macro and setting it whenManjunath Kudlur2016-02-162-4/+23
* | | | Merge pull request #1241 from jskeet/more-merge-wrapper-testsJan Tattermusch2016-02-171-2/+41
|\ \ \ \
| * | | | Add more tests around merging wrappersJon Skeet2016-02-151-2/+41
| | |/ / | |/| |
* | | | Merge pull request #260 from ejsd1989/issue-#242Joshua Haberman2016-02-162-4/+2
|\ \ \ \
| * | | | Removal of null checkeissajamil@gmail.com2015-03-291-3/+1
| * | | | Removal of null checkeissajamil@gmail.com2015-03-291-1/+1
* | | | | Merge pull request #1224 from google/rubysentinelJoshua Haberman2016-02-161-9/+9
|\ \ \ \ \
| * | | | | Removed 'optional' from proto3 syntax file.Josh Haberman2016-02-101-9/+9
* | | | | | Merge pull request #1247 from thomasvl/xctool_plain_outputThomas Van Lenten2016-02-161-5/+4
|\ \ \ \ \ \
| * | | | | | Move the xctool use of -reporter into a common spot and always use "plain" to...Thomas Van Lenten2016-02-161-5/+4
|/ / / / / /
* | | | | | Merge pull request #1245 from thomasvl/tweak_xctool_ios_runThomas Van Lenten2016-02-161-1/+7
|\ \ \ \ \ \
| * | | | | | Tweak the xctool run for iOS tests to try and sort out flakeThomas Van Lenten2016-02-161-1/+7
|/ / / / / /
* | | | | | Merge pull request #1244 from thomasvl/bump_xcode_versionThomas Van Lenten2016-02-163-5/+16
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Bump up travis to Xcode 7.2Thomas Van Lenten2016-02-163-5/+16
|/ / / / /
* | | | | Merge pull request #1226 from jcanizales/patch-1Paul Yang2016-02-121-0/+3
|\ \ \ \ \
| * | | | | Include 'source' attribute in the podspecJorge Canizales2016-02-101-0/+3
* | | | | | Merge pull request #1144 from dongjoon-hyun/remove_redundant_theJoshua Haberman2016-02-1110-12/+11
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Rewrap the lineDongjoon Hyun2016-02-111-2/+1
| * | | | | Remove redundant `the` in comments.Dongjoon Hyun2016-02-0310-11/+11
* | | | | | Merge pull request #997 from anderscarling/better_errorsJoshua Haberman2016-02-113-6/+47
|\ \ \ \ \ \
| * | | | | | Invoke super implementation instead of raising errorAnders Carling2015-11-231-2/+2
| * | | | | | Add field name to initialization map exceptionsAnders Carling2015-11-203-5/+22
| * | | | | | Use same exception class in ruby and jrubyAnders Carling2015-11-201-1/+1
| * | | | | | Raise NoMethodError for unknown fieldsAnders Carling2015-11-203-1/+25
* | | | | | | Merge pull request #1178 from lebauce/fix-readme-typosJoshua Haberman2016-02-111-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix typos in README.mdSylvain Baubeau2016-01-251-2/+2
* | | | | | | | Merge pull request #1179 from ParthKolekar/python-examples-withJoshua Haberman2016-02-112-9/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Updated python examples to use with.Parth Kolekar2016-01-262-9/+6
| |/ / / / / / /
* | | | | | | | Merge pull request #1194 from Photonios/masterJoshua Haberman2016-02-116-37/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed unused parameters and extra ';'Swen Kooij2016-01-286-37/+37
* | | | | | | | | Merge pull request #1217 from jhump/jh/make-warning-usefulJoshua Haberman2016-02-111-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | make 'no syntax' warning useful by showing which fileJoshua Humphries2016-02-061-3/+3
* | | | | | | | | | Merge pull request #1218 from jskeet/nuspec-dependenciesJan Tattermusch2016-02-111-0/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | nuspec dependency fixesJon Skeet2016-02-081-0/+10
* | | | | | | | | | Merge pull request #1225 from google/nmakedocJoshua Haberman2016-02-101-1/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Clarified that 'nmake' must be run before 'nmake check'.Josh Haberman2016-02-101-1/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1185 from kkm000/icl-fixJoshua Haberman2016-02-102-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix Intel compiler warnings in include files on Windowskkm2016-01-272-4/+4
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #1220 from jtattermusch/add_strong_name_keyJan Tattermusch2016-02-104-3/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add a linkJan Tattermusch2016-02-101-2/+2
| * | | | | | | | | Use checked-in key to build ReleaseSignedJan Tattermusch2016-02-092-2/+2
| * | | | | | | | | add private key for strong name assembliesJan Tattermusch2016-02-092-1/+5
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1214 from haberman/binarygemJoshua Haberman2016-02-084-8/+26
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Merge pull request #1 from nicolasnoble/bin-gemsJoshua Haberman2016-02-052-3/+9
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Actually enabling cross compilation.Nicolas "Pixel" Noble2016-02-061-1/+7
| | * | | | | | | | Removing usage of git - not everyone grabs the gem using it.Nicolas "Pixel" Noble2016-02-061-2/+2
| |/ / / / / / / /