Skip to content
Snippets Groups Projects
Commit 52cb2fe4 authored by Eric M. Tulla (BigPapi)'s avatar Eric M. Tulla (BigPapi)
Browse files

Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/

parents 33bced54 22e6c3f9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 0 deletions
.hgignore
+ 2
− 0
View file @ 52cb2fe4
...@@ -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% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment