summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-03-22 15:42:46 -0700
committerRichard Linden <none@none>2012-03-22 15:42:46 -0700
commitef9ddc096b034df5925522a2d423bbbdc01053c7 (patch)
tree2cf5cdbd1a923c4270082e2a3d9a9f4456d4779b /.hgignore
parent1ebcb8039369175f7f43fc19956f32c923cfe1ba (diff)
parent1886846725252254058168dcf6fc6082c15ebed4 (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