summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Wasserka <neobrainx@gmail.com>2014-12-14 23:20:52 +0100
committerTony Wasserka <neobrainx@gmail.com>2014-12-14 23:20:52 +0100
commitbefff3232da5f993672bb9077f6ea09c7fffd6ae (patch)
tree788f10ef8c46d59520583b8e432039f728e4d346
parent8eac8ee3f3111487129acf17d22c9ef1c9f9f868 (diff)
parent99f1326e818a00785ee9ef48f100db0388b2cab3 (diff)
Merge pull request #257 from lioncash/gitignore
Update gitignore with OS-specific global filetypes.
-rw-r--r--.gitignore16
1 files changed, 16 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5e4a6eef9..ad8aea5da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,19 @@ src/common/scm_rev.cpp
# Project/editor files
*.swp
.idea/
+
+# *nix related
+# Common convention for backup or temporary files
+*~
+
+# OSX global filetypes
+# Created by Finder or Spotlight in directories for various OS functionality (indexing, etc)
+.DS_Store
+.AppleDouble
+.LSOverride
+.Spotlight-V100
+.Trashes
+
+# Windows global filetypes
+Thumbs.db
+