diff options
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index de2627d9d6..51b0a38e0a 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -5,6 +5,10 @@ | |||
| 5 | .DS_Store | 5 | .DS_Store |
| 6 | ._* | 6 | ._* |
| 7 | 7 | ||
| 8 | # Merge files | ||
| 9 | *.orig | ||
| 10 | *.rej | ||
| 11 | |||
| 8 | # Build artifacts | 12 | # Build artifacts |
| 9 | .clang_complete | 13 | .clang_complete |
| 10 | .build/ | 14 | .build/ |