Skip to content

Commit

Permalink
Merge remote-tracking branch 'google/master' into bazel-take-2
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicolasnoble
nicolasnoble committed Jan 4, 2017
2 parents 19014de + ddebfa6 commit 203860a
Show file tree
Hide file tree
Showing 1,802 changed files with 63,657 additions and 30,320 deletions.
4 changes: 2 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ py27/
py34/

# Node installation output
^node_modules
node_modules
src/node/extension_binary/

# gcov coverage data
Expand Down Expand Up @@ -96,7 +96,7 @@ DerivedData
Pods/

# Artifacts directory
artifacts/
/artifacts/

# Git generated files for conflicting
*.orig
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@
[submodule "third_party/thrift"]
path = third_party/thrift
url = https://github.com/apache/thrift.git
[submodule "third_party/benchmark"]
path = third_party/benchmark
url = https://github.com/google/benchmark
Loading

0 comments on commit 203860a

Please sign in to comment.