summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2009-11-03 15:55:53 -0700
committerXiaohong Bao <bao@lindenlab.com>2009-11-03 15:55:53 -0700
commit81e719387983990fe0a2a197a6e09059219c119a (patch)
treef9f8b1bcab20e99413311f758dac521a3093050b /.hgignore
parenteaa1ce61b084f23746934e0a7b899242045d691b (diff)
parent9637333708a84a73784248cb842df68e520a311a (diff)
merge
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore6
1 files changed, 6 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 8e02212e79..cff2a14b94 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,8 +1,14 @@
syntax: glob
+# WinMerge temp files
+*.bak
+# Compiled python bytecode
*.pyc
+# Emacs temp files
*~
.*.swp
+#OSX image cache file
+*.DS_Store
LICENSES
indra/.distcc
indra/build-darwin-*