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

Conflicts: Global/OSX.gitignore
2012-08-27 12:40:37 +02:00 · 2012-08-27 12:40:37 +02:00 · 964de38e9b
commit 964de38e9b
parent 54928f53d7 f1cb24b9c2
4 changed files with 23 additions and 0 deletions
--- a/AppceleratorTitanium.gitignore
+++ b/AppceleratorTitanium.gitignore
@ -0,0 +1,3 @@
+# 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
@ -1,10 +1,24 @@
 .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/