summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2015-07-01 08:47:50 -0700
committerRider Linden <rider@lindenlab.com>2015-07-01 08:47:50 -0700
commit9f2302bdffde0c82a0cfab730a250aaee9b7059c (patch)
tree942b1e99701fa70993515d706bdedc836157ef30 /.hgignore
parentf25179f148415763e310b0dd7f91a37dcf4c58c0 (diff)
parent4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff)
Merge
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