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

Conflicts: Global/OSX.gitignore

Merge branch 'master' of https://github.com/github/gitignore
Conflicts: Global/OSX.gitignore
964de38e · Ali Servet Donmez · 54928f53 · f1cb24b9 · 964de38e · 964de38e
Commit 964de38e authored Aug 27, 2012 by Ali Servet Donmez
Showing with 23 additions and 0 deletions

AppceleratorTitanium.gitignore AppceleratorTitanium.gitignore +3 -0

Matlab.gitignore Global/Matlab.gitignore +5 -0

OSX.gitignore Global/OSX.gitignore +14 -0

Objective-C.gitignore Objective-C.gitignore +1 -0

No files found.
--- a/AppceleratorTitanium.gitignore
+++ b/AppceleratorTitanium.gitignore
+# Build folder and log file
+build/
+build.log
--- 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/
--- a/Global/OSX.gitignore
+++ b/Global/OSX.gitignore
 .DS_Store
+
+.AppleDouble
+
 .LSOverride
+
 Icon

+
+
+
+
 # Thumbnails
+
 ._*

+
+
 # Files that might appear on external disk
+
 .Spotlight-V100
+
 .Trashes
+
--- a/Objective-C.gitignore
+++ b/Objective-C.gitignore
@@ -15,3 +15,4 @@ xcuserdata
 profile
 *.moved-aside
 DerivedData
+.idea/