| commit | af1158126075c007a0e2fcdf99609545685f62e6 | [log] [tgz] |
|---|---|---|
| author | Craig Tiller <ctiller@google.com> | Thu Mar 09 15:09:34 2017 -0800 |
| committer | Craig Tiller <ctiller@google.com> | Thu Mar 09 15:09:34 2017 -0800 |
| tree | 1e50761cd5a2414789cb51dc048c6fbd44c91682 | |
| parent | 4d92a49fc0a96afc7f4539c0e600f06b6e4089f6 [diff] [blame] | |
| parent | eb064ec7b81b60c5e1eb47d6124d0c05056b3097 [diff] [blame] |
Merge github.com:grpc/grpc into cpp_bazelness
diff --git a/WORKSPACE b/WORKSPACE index 8e15cb7..653c473 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -34,13 +34,13 @@ ) bind( -<<<<<<< HEAD name = "benchmark", actual = "@submodule_benchmark//:benchmark", -======= +) + +bind( name = "gflags", actual = "@com_github_gflags_gflags//:gflags", ->>>>>>> f2cf3d94a1a46db2ebb2c13c3476e58ecdae6006 ) new_local_repository(