merge

2009-11-02 10:02:03 -08:00 · 2009-11-02 10:02:03 -08:00 · bfec29d46f
parent 3783852444 116f5c7880
commit bfec29d46f
1 changed files with 4 additions and 0 deletions
--- 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