summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrichard <none@none>2009-11-02 10:02:03 -0800
committerrichard <none@none>2009-11-02 10:02:03 -0800
commitbfec29d46fa446b44446f01516d52a6898b4e83b (patch)
treea8df93b26c7e096fc5ae4f9275244356e4164e1f
parent3783852444825edf420e6109927df21fd004c3e7 (diff)
parent116f5c7880ceead16133d51693adc1ca25564049 (diff)
merge
-rw-r--r--.hgignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 454be00dbf..fb53e79089 100644
--- a/.hgignore
+++ b/.hgignore
@@ -48,3 +48,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