Conflicts:
	Global/OSX.gitignore
This commit is contained in:
Ali Servet Donmez 2012-08-27 12:40:37 +02:00
commit 964de38e9b
4 changed files with 23 additions and 0 deletions

View File

@ -0,0 +1,3 @@
# Build folder and log file
build/
build.log

View File

@ -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/

View File

@ -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

View File

@ -15,3 +15,4 @@ xcuserdata
profile profile
*.moved-aside *.moved-aside
DerivedData DerivedData
.idea/