diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-09-29 01:31:54 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-09-29 01:31:54 +0200 |
| commit | 87a108121134e9603e3e60e732b23cbeb619be14 (patch) | |
| tree | f19efe6ed3dc6706b21fc9138a975fce74d66783 /.gitmodules | |
| parent | b97f867b390193daf18988958183143726602727 (diff) | |
| parent | 4f13db3c6cfaae52b6d7e35edaa352bccff70b66 (diff) | |
Merge remote-tracking branch 'google/v1.0.x' into master-upmerge-from-deep-under
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index fb79d5cbd5..3665cde63f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,9 +14,6 @@ [submodule "third_party/boringssl"] path = third_party/boringssl url = https://github.com/google/boringssl.git -[submodule "third_party/nanopb"] - path = third_party/nanopb - url = https://github.com/nanopb/nanopb.git [submodule "third_party/thrift"] path = third_party/thrift url = https://github.com/apache/thrift.git |