Merge branch 'master' of https://github.com/github/gitignore
Conflicts: Global/OSX.gitignore
This commit is contained in:
commit
964de38e9b
3
AppceleratorTitanium.gitignore
Normal file
3
AppceleratorTitanium.gitignore
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
# Build folder and log file
|
||||||
|
build/
|
||||||
|
build.log
|
@ -9,3 +9,8 @@
|
|||||||
# OSX / *nix default autosave extension
|
# OSX / *nix default autosave extension
|
||||||
*.m~
|
*.m~
|
||||||
|
|
||||||
|
# Compiled MEX binaries (all platforms)
|
||||||
|
*.mex*
|
||||||
|
|
||||||
|
# Simulink Code Generation
|
||||||
|
slprj/
|
||||||
|
@ -1,10 +1,24 @@
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
|
|
||||||
|
.AppleDouble
|
||||||
|
|
||||||
.LSOverride
|
.LSOverride
|
||||||
|
|
||||||
Icon
|
Icon
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Thumbnails
|
# Thumbnails
|
||||||
|
|
||||||
._*
|
._*
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Files that might appear on external disk
|
# Files that might appear on external disk
|
||||||
|
|
||||||
.Spotlight-V100
|
.Spotlight-V100
|
||||||
|
|
||||||
.Trashes
|
.Trashes
|
||||||
|
|
||||||
|
@ -15,3 +15,4 @@ xcuserdata
|
|||||||
profile
|
profile
|
||||||
*.moved-aside
|
*.moved-aside
|
||||||
DerivedData
|
DerivedData
|
||||||
|
.idea/
|
||||||
|
Loading…
Reference in New Issue
Block a user