summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-05-22 06:03:42 -0400
committerOz Linden <oz@lindenlab.com>2012-05-22 06:03:42 -0400
commit7637acf76e6a1170508e8bddd381c426d219b1ee (patch)
treec48b5ea58fda587a103278860b943122f6ce8fae /.hgignore
parent6525fc4a4fc09e02c4fa709e0cbba4aa8d7d25ae (diff)
parentc4dfdcb338aaeeb4e3adc4e1aef4f5b190ef5c57 (diff)
merge changes for DRTVWR-149
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