summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-11-02 09:54:52 -0800
committerRick Pasetto <rick@lindenlab.com>2009-11-02 09:54:52 -0800
commit9ed8b5299f2e5a8a912649e0e6aecaf89b034408 (patch)
treee7c9ecc91fbbef0c26fd352f2743ac050d8f889e /.hgignore
parent55731ee318e6e3c2e9998c6347cbd9d3635115c4 (diff)
parent3783852444825edf420e6109927df21fd004c3e7 (diff)
Merge from remote repo
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