Merge branch 'master' into feature/unittesting
# Conflicts: # .gitignore # src/Makefile.in
This commit is contained in:
11
.gitignore
vendored
11
.gitignore
vendored
@@ -84,4 +84,15 @@ src/test/testfile
|
||||
.vscode
|
||||
.project
|
||||
.settings
|
||||
.idea
|
||||
.cproject
|
||||
|
||||
|
||||
# macOS generated files
|
||||
.DS_Store
|
||||
.DS_Store?
|
||||
._*
|
||||
.Spotlight-V100
|
||||
.Trashes
|
||||
ehthumbs.db
|
||||
Thumbs.db
|
||||
|
||||
Reference in New Issue
Block a user