summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-11-02 08:49:05 -0800
committerJames Cook <james@lindenlab.com>2009-11-02 08:49:05 -0800
commit3783852444825edf420e6109927df21fd004c3e7 (patch)
tree89a7b38df484b2a32c7620203111d5a0c8f801cd /.hgignore
parent7e086d46743d8cc3b51e494f0ca1d18829ab78ee (diff)
parent94dfb5c933739fc69f8a6c083899d1cd313bc514 (diff)
merge
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 8e02212e79..454be00dbf 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,6 +1,10 @@
syntax: glob
+# WinMerge temp files
+*.bak
+# Compiled python bytecode
*.pyc
+# Emacs temp files
*~
.*.swp
LICENSES