summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-06-25 17:16:29 -0400
committerOz Linden <oz@lindenlab.com>2012-06-25 17:16:29 -0400
commit0f958faacd37461a26af76d34a6b29744a2cd1ec (patch)
tree2233d2143c3529a1ffd3b66ee9db5108abeb77f4 /.hgignore
parent1b8bbc7b863ccfc25833dcdbbf0dd9e3e96dc0bb (diff)
parenteff9be530805298339f656f86a52ade9efeba779 (diff)
merge up to 3.3.3-release + pathfinding
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