Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
9fa14655df
1 changed files with 4 additions and 0 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
@ -5,6 +5,10 @@
|
|||
.DS_Store
|
||||
._*
|
||||
|
||||
# Merge files
|
||||
*.orig
|
||||
*.rej
|
||||
|
||||
# Build artifacts
|
||||
.clang_complete
|
||||
.build/
|
||||
|
|
Loading…
Reference in a new issue