summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-02-24 21:02:12 -0500
committerNat Goodspeed <nat@lindenlab.com>2015-02-24 21:02:12 -0500
commitb5324afb6f2e45deefb9b79e7e2192bc686b181a (patch)
treedcae0395e2975f736a90c1fa3c67d6f318e01cc7 /.hgignore
parent9b45bc992edf8d049d8a1abe2e778870a493295a (diff)
parentc7841b48bdec74848a64e2dd0eac453ce855093d (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to '.hgignore')
-rwxr-xr-x.hgignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.hgignore b/.hgignore
index f3fca9bcb2..29877ffa09 100755
--- a/.hgignore
+++ b/.hgignore
@@ -1,6 +1,5 @@
syntax: glob
-
# WinMerge temp files
*.bak
# Compiled python bytecode