Permalink
Browse files

Merge branch 'master' of https://github.com/github/gitignore

Conflicts:
	Global/OSX.gitignore
  • Loading branch information...
2 parents 54928f5 + f1cb24b commit 964de38e9b75e3c716496180001e1765ca3ecd9d @exalted exalted committed Aug 27, 2012
Showing with 23 additions and 0 deletions.
  1. +3 −0 AppceleratorTitanium.gitignore
  2. +5 −0 Global/Matlab.gitignore
  3. +14 −0 Global/OSX.gitignore
  4. +1 −0 Objective-C.gitignore
@@ -0,0 +1,3 @@
+# Build folder and log file
+build/
+build.log
@@ -9,3 +9,8 @@
# OSX / *nix default autosave extension
*.m~
+# Compiled MEX binaries (all platforms)
+*.mex*
+
+# Simulink Code Generation
+slprj/
View
@@ -1,10 +1,24 @@
.DS_Store
+
+.AppleDouble
+
.LSOverride
+
Icon
+
+
+
+
# Thumbnails
+
._*
+
+
# Files that might appear on external disk
+
.Spotlight-V100
+
.Trashes
+
@@ -15,3 +15,4 @@ xcuserdata
profile
*.moved-aside
DerivedData
+.idea/

0 comments on commit 964de38

Please sign in to comment.