summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-05-25 14:22:33 -0400
committerOz Linden <oz@lindenlab.com>2012-05-25 14:22:33 -0400
commitee66cb3efccd6976c5a7725620956ea7030b7b57 (patch)
tree7ae469e4d2aac985589e7df902959b27c603b2ad /.hgignore
parent5ef8372e433896be174d7123bd4663087601a0df (diff)
parent3e8dab32ee88e0a6fda51c218c61d718cf9dcafa (diff)
merge back beta tags
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