From dfb30c64093aa7033755bc4f472e194886630b1e Mon Sep 17 00:00:00 2001 From: Safwan Choudhury Date: Wed, 18 Apr 2012 23:15:10 -0400 Subject: [PATCH 1/5] Ignoring compiled MEX binaries for all platforms Including mexglx, mexa64, mexmaci64, mexw32 & mex64 (see http://sfwn.in/FxbE for official list from Mathworks). --- Global/Matlab.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Global/Matlab.gitignore b/Global/Matlab.gitignore index bbc35d7e..20843f21 100644 --- a/Global/Matlab.gitignore +++ b/Global/Matlab.gitignore @@ -9,3 +9,5 @@ # OSX / *nix default autosave extension *.m~ +# Compiled MEX binaries (all platforms) +*.mex* From 6670a4c42336cf227406a3de7090220e76b918b6 Mon Sep 17 00:00:00 2001 From: Stig Brautaset Date: Tue, 1 May 2012 22:11:46 +0200 Subject: [PATCH 2/5] Ignore .idea/ folder for AppCode users. --- Objective-C.gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Objective-C.gitignore b/Objective-C.gitignore index 5ba3b592..2697808d 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -13,4 +13,5 @@ build/* xcuserdata profile *.moved-aside -DerivedData \ No newline at end of file +DerivedData +.idea/ \ No newline at end of file From 174c45e796b57d79ac1b8a400559d6b7a272a4a5 Mon Sep 17 00:00:00 2001 From: Jonas Trevisan Date: Wed, 22 Aug 2012 13:38:50 -0300 Subject: [PATCH 3/5] Added .AppleDouble to OSX --- Global/OSX.gitignore | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Global/OSX.gitignore b/Global/OSX.gitignore index f9516c09..bdc30421 100644 --- a/Global/OSX.gitignore +++ b/Global/OSX.gitignore @@ -1,9 +1,11 @@ -.DS_Store -Icon - -# Thumbnails -._* - -# Files that might appear on external disk -.Spotlight-V100 -.Trashes +.DS_Store +.AppleDouble +Icon + + +# Thumbnails +._* + +# Files that might appear on external disk +.Spotlight-V100 +.Trashes From a1ef23350d062b9da07e7d9e5f0652b9e1e55ea2 Mon Sep 17 00:00:00 2001 From: Mike Nikles Date: Wed, 22 Aug 2012 18:06:15 -0700 Subject: [PATCH 4/5] Added Appcelerator Titanium .gitignore file. --- AppceleratorTitanium.gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 AppceleratorTitanium.gitignore diff --git a/AppceleratorTitanium.gitignore b/AppceleratorTitanium.gitignore new file mode 100644 index 00000000..3abea559 --- /dev/null +++ b/AppceleratorTitanium.gitignore @@ -0,0 +1,3 @@ +# Build folder and log file +build/ +build.log From f78c09ffd22421ba6de22975140934a07e2d9a48 Mon Sep 17 00:00:00 2001 From: Coby Chapple Date: Fri, 24 Aug 2012 16:43:07 +1000 Subject: [PATCH 5/5] Manual merge to close #305 --- Global/Matlab.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Global/Matlab.gitignore b/Global/Matlab.gitignore index 20843f21..f52813b6 100644 --- a/Global/Matlab.gitignore +++ b/Global/Matlab.gitignore @@ -11,3 +11,6 @@ # Compiled MEX binaries (all platforms) *.mex* + +# Simulink Code Generation +slprj/