summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorrichard <none@none>2009-11-04 12:31:15 -0800
committerrichard <none@none>2009-11-04 12:31:15 -0800
commit26d81f656ab358c8089da4b0e4e558ac2c4374b9 (patch)
treef112398eb6c491339188f3bc6a13a4ade36c5d22 /.hgignore
parenta1fc7dc411802535ee585e26215bd228d583c0ec (diff)
parenteca4416855b97ee017e55581616b8e4aa0c5e4d4 (diff)
merge
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index cff2a14b94..e390f591e5 100644
--- a/.hgignore
+++ b/.hgignore
@@ -50,3 +50,7 @@ tarfile_tmp
^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