summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-03-20 18:33:40 -0700
committerRichard Linden <none@none>2012-03-20 18:33:40 -0700
commit760103bf59a24e968fc91dcd58f4058dd137f7ca (patch)
treeead4debfbcb3b95547d37800911759bbab9d7057 /.hgignore
parent4c15635527800120f98aa1402d71baa4b9fbc932 (diff)
parent51f89c8def159824f72a9efa556dbe364eac0b50 (diff)
Automated merge with ssh://hg.lindenlab.com/merov/viewer-thx1138
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 403b73df6d..94391e11ab 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,5 +1,6 @@
syntax: glob
+
# WinMerge temp files
*.bak
# Compiled python bytecode