summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorcallum_linden <none@none>2015-06-30 11:51:58 -0700
committercallum_linden <none@none>2015-06-30 11:51:58 -0700
commit8eb7e9d9522f598321e1f8cba5ab8166a52c5bcb (patch)
treee24f1b1735f17968410704e56d0e043fb143aafe /.hgignore
parentf7908a50294adff3456436074075a677a9c6239b (diff)
parent4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff)
Merge with head of viewer-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