summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-07-07 17:06:09 -0400
committerOz Linden <oz@lindenlab.com>2015-07-07 17:06:09 -0400
commitf7d94905db3f39785863b91f75daf612dc6c3c48 (patch)
treeca958ce0a621c0ed8012336fbdb03867409c1f17 /.hgignore
parentfa1913ea679fd895d709da5c5782b26c7d03a40a (diff)
parent4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff)
merge changes for 3.8.0-release
Diffstat (limited to '.hgignore')
-rwxr-xr-x.hgignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.hgignore b/.hgignore
index 10549b6144..1b7a9019a2 100755
--- a/.hgignore
+++ b/.hgignore
@@ -1,6 +1,5 @@
syntax: glob
-
# WinMerge temp files
*.bak
# Compiled python bytecode