aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ / / / / /
| * | | | | | Add rake-compiler-dock as a dep.Josh Haberman2016-02-042-3/+6
| * | | | | | Added support for binary gems.Josh Haberman2016-02-043-3/+12
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #1205 from haberman/fixjstestsJoshua Haberman2016-02-053-103/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Enable JavaScript tests for binary parse/serialize.Josh Haberman2016-02-023-103/+3
* | | | | | Merge pull request #1213 from jskeet/rename-preconditionsJon Skeet2016-02-0426-142/+147
|\ \ \ \ \ \
| * | | | | | Generated code changes from previous commitJon Skeet2016-02-0411-53/+53
| * | | | | | Rename Preconditions to ProtoPreconditionsJon Skeet2016-02-0416-89/+94
|/ / / / / /
* | | | | | Merge pull request #1210 from jskeet/rename-generatedcodeinfoJan Tattermusch2016-02-0425-185/+495
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Generated code for GeneratedCodeInfo changeJon Skeet2016-02-0419-168/+478
| * | | | | Rename GeneratedCodeInfo to GeneratedClrTypeInfoJon Skeet2016-02-046-17/+17
|/ / / / /
* | | | | Merge pull request #1207 from jskeet/readmeJie Luo2016-02-031-16/+32
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Clarify readmeJon Skeet2016-02-031-16/+32
|/ / / /
* | | | Merge pull request #1165 from damienmg/masterJisi Liu2016-02-021-6/+10
|\ \ \ \
| * | | | Make protobuf Skylark extension appends the workspace rootDamien Martin-Guillerez2016-01-151-6/+10
* | | | | Merge pull request #1195 from calbach/python-json-structJie Luo2016-02-015-25/+659
|\ \ \ \ \
| * | | | | Manually down-integrate python JSON struct support from internal code base.CH Albach2016-01-295-25/+659
| | |/ / / | |/| | |
* | | | | Merge pull request #1199 from google/google_integrateJisi Liu2016-02-0127-585/+2104
|\ \ \ \ \ | |/ / / / |/| | | |