summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorangela <angela@lindenlab.com>2009-11-05 11:41:07 +0800
committerangela <angela@lindenlab.com>2009-11-05 11:41:07 +0800
commit95738da3d82b92e82744dbc6b377a3feae2e6441 (patch)
treecf1678c617ea644a14d20a40fbfc58f156fd9591 /.hgignore
parent35c7c7a9b29ef4462ea969b393c25b59813ef169 (diff)
parentaf401ac6dc463db477210b0ff100014fbeb50a9a (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