summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-03-25 11:53:36 -0700
committerMerov Linden <merov@lindenlab.com>2012-03-25 11:53:36 -0700
commit5b5173bf7dc053173cb6466d43f07662944fa360 (patch)
tree1fb4dbab0074d550baed5e65ca1a55d86bd7d1ab /.hgignore
parent5c86d19373ebfab446e8335729faefabc66ad15f (diff)
parentef9ddc096b034df5925522a2d423bbbdc01053c7 (diff)
Pull from 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