summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-16 10:28:35 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-16 10:28:35 +0000
commitaa7fadfde02d396ab04c82f91f01d486b4f5396d (patch)
tree21e0e919da0ad23f3a39b5128ba5313f0f8a78d5 /.hgignore
parente3367fad368660bf40db29a82237475a9f2dfdbd (diff)
parent9c5e4d315a4b5f5a0793587c6a6620f6efc76332 (diff)
merge from viewer2.
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 53ddf71bb7..94127df2d1 100644
--- a/.hgignore
+++ b/.hgignore
@@ -9,6 +9,7 @@ syntax: glob
.*.swp
#OSX image cache file
*.DS_Store
+*.orig
LICENSES
indra/.distcc
indra/build-darwin-*