Skip to content

Commit

Permalink
Merge github.com:grpc/grpc into cleaner-posix2
Browse files Browse the repository at this point in the history
  • Loading branch information
ctiller committed Mar 28, 2016
2 parents 59743d6 + e5cc05b commit 8a03448
Show file tree
Hide file tree
Showing 782 changed files with 12,880 additions and 13,884 deletions.
8 changes: 8 additions & 0 deletions .clang_complete
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
-Ithird_party/googletest/include
-Ithird_party/googletest
-Iinclude
-Igens
-I.
-Ithird_party/boringssl/include
-Ithird_party/zlib
-Ithird_party/protobuf/src
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
url = https://github.com/google/googletest.git
[submodule "third_party/boringssl"]
path = third_party/boringssl
url = https://boringssl.googlesource.com/boringssl
url = https://github.com/google/boringssl.git
[submodule "third_party/nanopb"]
path = third_party/nanopb
url = https://github.com/nanopb/nanopb.git
1,928 changes: 968 additions & 960 deletions BUILD

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions MANIFEST.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,28 @@
# Top-level Items by language

## Bazel
* [grpc.bzl](grpc.bzl)

## Node
* [binding.gyp](binding.gyp)
* [package.json](package.json)

## Objective-C
* [gRPC.podspec](gRPC.podspec)

## PHP
* [composer.json](composer.json)
* [config.m4](config.m4)
* [package.xml](package.xml)

## Python
* [requirements.txt](requirements.txt)
* [setup.cfg](setup.cfg)
* [setup.py](setup.py)
* [tox.ini](tox.ini)
* [PYTHON-MANIFEST.in](PYTHON-MANIFEST.in)

## Ruby
* [Gemfile](Gemfile)
* [grpc.gemspec](grpc.gemspec)
* [Rakefile](Rakefile)
948 changes: 497 additions & 451 deletions Makefile

Large diffs are not rendered by default.

403 changes: 202 additions & 201 deletions binding.gyp

Large diffs are not rendered by default.

Loading

0 comments on commit 8a03448

Please sign in to comment.