Skip to content
Snippets Groups Projects
Commit c9d121dd authored by Tofu Linden's avatar Tofu Linden
Browse files

merge

parents bc308465 52cb2fe4
No related branches found
No related tags found
No related merge requests found
...@@ -7,6 +7,8 @@ syntax: glob ...@@ -7,6 +7,8 @@ syntax: glob
# Emacs temp files # Emacs temp files
*~ *~
.*.swp .*.swp
#OSX image cache file
*.DS_Store
LICENSES LICENSES
indra/.distcc indra/.distcc
indra/build-darwin-* indra/build-darwin-*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment