Skip to content

Commit bf947bb

Browse files
andyolivaresandyolivares
authored
Merge branch 'rust-lang:master' into feature/show_window
2 parents bfb652c + 7d640b6 commit bf947bb

File tree

3,801 files changed

+75092
-38336
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,801 files changed

+75092
-38336
lines changed

‎.clang-format‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
BasedOnStyle: LLVM

‎.ignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Make vscode *not* count `config.toml` as ignored, so it is included in search
2+
!/config.toml

‎.reuse/dep5‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,14 @@ Files: compiler/*
2929
x
3030
x.ps1
3131
x.py
32+
.clang-format
3233
.editorconfig
3334
.git-blame-ignore-revs
3435
.gitattributes
3536
.gitignore
3637
.gitmodules
3738
.mailmap
39+
.ignore
3840
Copyright: The Rust Project Developers (see https://thanks.rust-lang.org)
3941
License: MIT or Apache-2.0
4042

0 commit comments

Comments
 (0)