summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorcallum_linden <none@none>2015-07-02 09:40:49 -0700
committercallum_linden <none@none>2015-07-02 09:40:49 -0700
commit71406f1af805d0b88e348b81a67bcde3d0b3d885 (patch)
tree9eab3e24208d2aecedf29eed0eebb6f209197475 /.hgignore
parentd89b4109f9ac3f1ef95480823df292bbc8200347 (diff)
parent8eb7e9d9522f598321e1f8cba5ab8166a52c5bcb (diff)
Merge with head
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