1 files changed, 11 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index eeb6d44996..e390f591e5 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,8 +1,14 @@
 syntax: glob
 
+# WinMerge temp files
+*.bak
+# Compiled python bytecode
 *.pyc
+# Emacs temp files
 *~
 .*.swp
+#OSX image cache file
+*.DS_Store
 LICENSES
 indra/.distcc
 indra/build-darwin-*
@@ -43,3 +49,8 @@ tarfile_tmp
 ^indra/web/dataservice/locale.*
 ^indra/web/dataservice/lib/shared/vault.*
 ^indra/web/dataservice/vendor.*
+glob:indra/newview/dbghelp.dll
+glob:*.cpp.orig
+glob:*.cpp.bak
+glob:*.h.bak
+glob:*.h.orig