aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-02-18Merge pull request #1255 from thomasvl/mark_os_x_python_cpp_failingThomas Van Lenten
2016-02-18List python_cpp as failing on OS XThomas Van Lenten
2016-02-18Merge pull request #1254 from thomasvl/disable_xctool_updatesThomas Van Lenten
2016-02-18Disable the xctool updatesThomas Van Lenten
2016-02-18Merge pull request #1239 from jskeet/call_generate_protosJon Skeet
2016-02-17Merge pull request #1229 from keveman/unlimited_binary_protoJoshua Haberman
2016-02-17Merge pull request #1241 from jskeet/more-merge-wrapper-testsJan Tattermusch
2016-02-16Merge pull request #260 from ejsd1989/issue-#242Joshua Haberman
2016-02-16Merge pull request #1224 from google/rubysentinelJoshua Haberman
2016-02-16Added PROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS macro and setting it whenManjunath Kudlur
2016-02-16Merge pull request #1247 from thomasvl/xctool_plain_outputThomas Van Lenten
2016-02-16Move the xctool use of -reporter into a common spot and always use "plain" to...Thomas Van Lenten
2016-02-16Merge pull request #1245 from thomasvl/tweak_xctool_ios_runThomas Van Lenten
2016-02-16Tweak the xctool run for iOS tests to try and sort out flakeThomas Van Lenten
2016-02-16Merge pull request #1244 from thomasvl/bump_xcode_versionThomas Van Lenten
2016-02-16Bump up travis to Xcode 7.2Thomas Van Lenten
2016-02-15Add more tests around merging wrappersJon Skeet
2016-02-15Generate C# code whenever descriptor.proto changesJon Skeet
2016-02-12Merge pull request #1226 from jcanizales/patch-1Paul Yang
2016-02-11Merge pull request #1144 from dongjoon-hyun/remove_redundant_theJoshua Haberman
2016-02-11Rewrap the lineDongjoon Hyun
2016-02-11Merge pull request #997 from anderscarling/better_errorsJoshua Haberman
2016-02-11Merge pull request #1178 from lebauce/fix-readme-typosJoshua Haberman
2016-02-11Merge pull request #1179 from ParthKolekar/python-examples-withJoshua Haberman
2016-02-11Merge pull request #1194 from Photonios/masterJoshua Haberman
2016-02-11Merge pull request #1217 from jhump/jh/make-warning-usefulJoshua Haberman
2016-02-11Merge pull request #1218 from jskeet/nuspec-dependenciesJan Tattermusch
2016-02-10Include 'source' attribute in the podspecJorge Canizales
2016-02-10Merge pull request #1225 from google/nmakedocJoshua Haberman
2016-02-10Clarified that 'nmake' must be run before 'nmake check'.Josh Haberman
2016-02-10Removed 'optional' from proto3 syntax file.Josh Haberman
2016-02-10Merge pull request #1185 from kkm000/icl-fixJoshua Haberman
2016-02-10Merge pull request #1220 from jtattermusch/add_strong_name_keyJan Tattermusch
2016-02-10Add a linkJan Tattermusch
2016-02-09Use checked-in key to build ReleaseSignedJan Tattermusch
2016-02-09add private key for strong name assembliesJan Tattermusch
2016-02-08Merge pull request #1214 from haberman/binarygemJoshua Haberman
2016-02-08nuspec dependency fixesJon Skeet
2016-02-06make 'no syntax' warning useful by showing which fileJoshua Humphries
2016-02-05Merge pull request #1 from nicolasnoble/bin-gemsJoshua Haberman
2016-02-06Actually enabling cross compilation.Nicolas "Pixel" Noble
2016-02-06Removing usage of git - not everyone grabs the gem using it.Nicolas "Pixel" Noble
2016-02-05Merge pull request #1205 from haberman/fixjstestsJoshua Haberman
2016-02-04Add rake-compiler-dock as a dep.Josh Haberman
2016-02-04Added support for binary gems.Josh Haberman
2016-02-04Merge pull request #1213 from jskeet/rename-preconditionsJon Skeet
2016-02-04Generated code changes from previous commitJon Skeet
2016-02-04Rename Preconditions to ProtoPreconditionsJon Skeet
2016-02-04Merge pull request #1210 from jskeet/rename-generatedcodeinfoJan Tattermusch
2016-02-04Generated code for GeneratedCodeInfo changeJon Skeet