From e1c4a4872986de590e1bfacfc5a1ad93c356a898 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Wed, 18 Apr 2012 14:46:06 -0700 Subject: [PATCH 1/9] priv is a legitimate part of an OTP application --- Erlang.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/Erlang.gitignore b/Erlang.gitignore index 64231648..b89b9a28 100644 --- a/Erlang.gitignore +++ b/Erlang.gitignore @@ -1,6 +1,5 @@ .eunit deps -priv *.o *.beam *.plt \ No newline at end of file From 720975f849ce5424393b6bbb92b038da78d50c57 Mon Sep 17 00:00:00 2001 From: Mike Kenyon Date: Tue, 1 May 2012 15:02:46 -0700 Subject: [PATCH 2/9] Add OSX-specific Icon\r rule --- Global/OSX.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Global/OSX.gitignore b/Global/OSX.gitignore index 5ad43cc4..f9516c09 100644 --- a/Global/OSX.gitignore +++ b/Global/OSX.gitignore @@ -1,4 +1,5 @@ .DS_Store +Icon # Thumbnails ._* From 4eebde9c47a14b65f3678aac1e578e48c34827e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 19 May 2012 12:02:40 +0200 Subject: [PATCH 3/9] added rule for .bz2 --> bzip2 --- Global/Archives.gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Global/Archives.gitignore b/Global/Archives.gitignore index 386c3330..82d3b10f 100644 --- a/Global/Archives.gitignore +++ b/Global/Archives.gitignore @@ -6,6 +6,7 @@ *.zip *.gz *.bzip +*.bz2 *.xz *.lzma @@ -19,4 +20,4 @@ *.gem *.egg *.deb -*.rpm \ No newline at end of file +*.rpm From c27430e74c0339a3d582d9117cb5d007597835da Mon Sep 17 00:00:00 2001 From: Sven Schultschik Date: Mon, 4 Jun 2012 22:59:05 +0200 Subject: [PATCH 4/9] PhPStorm gitignore --- Global/PhPStorm.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 Global/PhPStorm.gitignore diff --git a/Global/PhPStorm.gitignore b/Global/PhPStorm.gitignore new file mode 100644 index 00000000..62c89355 --- /dev/null +++ b/Global/PhPStorm.gitignore @@ -0,0 +1 @@ +.idea/ \ No newline at end of file From 5a860949c0858da5fe6b2ff0e64bd9256c845614 Mon Sep 17 00:00:00 2001 From: Coby Chapple Date: Wed, 8 Aug 2012 17:37:15 +1000 Subject: [PATCH 5/9] =?UTF-8?q?Remove=20space=20after=20Thumbs.db=20?= =?UTF-8?q?=E2=80=94=20fixes=20#355?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Global/Windows.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Global/Windows.gitignore b/Global/Windows.gitignore index 55f332cf..351ec9d1 100644 --- a/Global/Windows.gitignore +++ b/Global/Windows.gitignore @@ -1,5 +1,5 @@ # Windows image file caches -Thumbs.db +Thumbs.db ehthumbs.db # Folder config file From 2661a8201010647327a8d41d34545da8d17a158e Mon Sep 17 00:00:00 2001 From: Eduard Carreras Date: Wed, 8 Aug 2012 19:57:13 +0300 Subject: [PATCH 6/9] Adding pydev files --- Python.gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Python.gitignore b/Python.gitignore index f76ed740..df497ce8 100644 --- a/Python.gitignore +++ b/Python.gitignore @@ -31,4 +31,5 @@ nosetests.xml #Mr Developer .mr.developer.cfg - +.project +.pydevproject From 6073319fb14c6de42712a21bc1aab27af2d5f580 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Wed, 8 Aug 2012 16:33:51 -0700 Subject: [PATCH 7/9] Added .gitignore entries for .vspx and .log --- CSharp.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CSharp.gitignore b/CSharp.gitignore index d00f9691..99120852 100644 --- a/CSharp.gitignore +++ b/CSharp.gitignore @@ -32,6 +32,7 @@ x64/ *.tli *.tlh *.tmp +*.log *.vspscc *.vssscc .builds @@ -46,6 +47,7 @@ ipch/ # Visual Studio profiler *.psess *.vsp +*.vspx # Guidance Automation Toolkit *.gpState From de7a7117c71bb4a9ff2ac4ddbe346e2c0da85e0d Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Wed, 8 Aug 2012 16:34:59 -0700 Subject: [PATCH 8/9] Added .vspx and .log to .gitignore for VB --- VB.Net.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/VB.Net.gitignore b/VB.Net.gitignore index 5a4f80c0..a5d3ad35 100644 --- a/VB.Net.gitignore +++ b/VB.Net.gitignore @@ -33,6 +33,7 @@ x64/ *.tli *.tlh *.tmp +*.log *.vspscc *.vssscc .builds @@ -47,6 +48,7 @@ ipch/ # Visual Studio profiler *.psess *.vsp +*.vspx # Guidance Automation Toolkit *.gpState From 2f7bc6bab32f82fd01a623b35f5135345a4735c0 Mon Sep 17 00:00:00 2001 From: Honza Javorek Date: Sat, 18 Aug 2012 19:55:23 +0300 Subject: [PATCH 9/9] added missing whitespaces in comments --- Python.gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Python.gitignore b/Python.gitignore index df497ce8..d2d6f360 100644 --- a/Python.gitignore +++ b/Python.gitignore @@ -26,10 +26,10 @@ pip-log.txt .tox nosetests.xml -#Translations +# Translations *.mo -#Mr Developer +# Mr Developer .mr.developer.cfg .project .pydevproject