diff options
author | darkf <lw9k123@gmail.com> | 2014-12-29 19:47:41 -0800 |
---|---|---|
committer | darkf <lw9k123@gmail.com> | 2014-12-29 19:47:41 -0800 |
commit | 8ba9ac0f74abb0408a26207a76a0c1808bad8de0 (patch) | |
tree | f1c7c3393fa726435b5b90bf335567c93e528ef1 /.gitignore | |
parent | a19354acedbfeafd28219c48a1ec32f76dd17a54 (diff) | |
parent | 3d14eb285382740b144e5b047cb2ad072f6129ea (diff) |
Fix merge conflicts
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 16 |
1 files changed, 16 insertions, 0 deletions
@@ -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 + |