From 948ce87cd9ed34b1353501cae69c10f5299120ea Mon Sep 17 00:00:00 2001
From: syntaqx <syntaqx@gmail.com>
Date: Fri, 18 May 2012 23:51:00 -0600
Subject: [PATCH] added gitattributes file and updated gitignore

Signed-off-by: syntaqx <syntaqx@gmail.com>
---
 .gitattributes |  1 +
 .gitignore     | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..2125666142e
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text=auto
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index e43b0f98895..49d6cd59083 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,37 @@
+# Numerous always-ignore extensions
+*.diff
+*.err
+*.orig
+*.log
+*.rej
+*.swo
+*.swp
+*.vi
+*~
+*.sass-cache
+
+# OS or Editor folders
 .DS_Store
+Thumbs.db
+.cache
+.project
+.settings
+.tmproj
+*.esproj
+nbproject
+
+# Dreamweaver added files
+_notes
+dwsync.xml
+
+# Komodo
+*.komodoproject
+.komodotools
+
+# Folders to ignore
+.hg
+.svn
+.CVS
+intermediate
+publish
+.idea
\ No newline at end of file