summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-06-28 10:35:22 -0400
committerOz Linden <oz@lindenlab.com>2012-06-28 10:35:22 -0400
commit764d1e3cafa3e86f1f44a4c2bec0705879b9da38 (patch)
treea2ac72c6625c729e73ae6077e790a104c2b598a3 /.hgignore
parentba90a4ec367d47a6876962d7d071cf4615289a11 (diff)
parent90547ff411db177bf6424ca553449a81a808fc0f (diff)
merge up to 3.3.3-release
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index bc3020eee4..501f9e6abe 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,5 +1,6 @@
syntax: glob
+
# WinMerge temp files
*.bak
# Compiled python bytecode