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

exalted · exalted · commit 964de38e9b75 · 2012-08-27T12:40:37.000+02:00
Conflicts:
	Global/OSX.gitignore
diff --git a/AppceleratorTitanium.gitignore b/AppceleratorTitanium.gitignore
@@ -0,0 +1,3 @@
+# Build folder and log file
+build/
+build.log
diff --git a/Global/Matlab.gitignore b/Global/Matlab.gitignore
@@ -9,3 +9,8 @@
 # OSX / *nix default autosave extension
 *.m~
 
+# Compiled MEX binaries (all platforms)
+*.mex*
+
+# Simulink Code Generation	
+slprj/
diff --git a/Global/OSX.gitignore b/Global/OSX.gitignore
@@ -1,10 +1,24 @@
 .DS_Store
+
+.AppleDouble
+
 .LSOverride
+
 Icon
 
+
+
+
+
 # Thumbnails
+
 ._*
 
+
+
 # Files that might appear on external disk
+
 .Spotlight-V100
+
 .Trashes
+
diff --git a/Objective-C.gitignore b/Objective-C.gitignore
@@ -15,3 +15,4 @@ xcuserdata
 profile
 *.moved-aside
 DerivedData
+.idea/
