Commit Graph

9 Commits

Author SHA1 Message Date
Nicolas Noble fee065c1c7 Merge branch 'master' of github.com:google/grpc into json
Conflicts:
	src/core/security/credentials.c
2015-01-26 11:41:12 -08:00
Nicolas "Pixel" Noble d56602133c OpenSSL 1.0.2 is out of beta - let's update our own repositories to reflect that. 2015-01-23 20:53:57 +01:00
Nicolas Noble 614c2bf99b Replacing cJSON with our own code instead. 2015-01-22 15:32:02 -08:00
Nicolas Noble 7ce706b722 Removing libevent from third_party, as it's no longer necessary. 2015-01-13 16:18:11 -08:00
Tim Emiola fa37163f5c Updated protobuf: it now includes the official ruby-protobuf 2015-01-05 15:39:23 -08:00
Nicolas Noble 505f7232d1 Renaming libevent was an oversight, please bear with me. 2014-12-10 17:19:13 -08:00
Nicolas Noble 9db8509c9a Renaming libevent to event2, and adding gflags submodule. 2014-12-10 14:24:07 -08:00
Nicolas Noble ec63b8e926 Adding third-party submodules. 2014-12-08 16:39:50 -08:00
Nicolas Noble b7ebd3b8c6 Initial import. 2014-11-26 16:33:03 -08:00