summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-11-24 22:11:24 -0500
committerLoren Shih <seraph@lindenlab.com>2009-11-24 22:11:24 -0500
commitccf6cb3f9ba387117720d700b73ac8e05dbf1f75 (patch)
tree71163fde19389893c8951ebb723ddf9379318518 /.hgignore
parent2369fa96c24bafbd032c85b58767502cfd37ebaf (diff)
parent5b5354c933aa7b1ceeb307853c24fba28d4e31bf (diff)
viewer-2.0 automated merge
--HG-- branch : avatar-pipeline
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore5
1 files changed, 5 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 886af2b007..53ddf71bb7 100644
--- a/.hgignore
+++ b/.hgignore
@@ -55,3 +55,8 @@ glob:*.cpp.orig
glob:*.cpp.bak
glob:*.h.bak
glob:*.h.orig
+glob:indra/newview/typed_locations.txt
+glob:indra/newview/teleport_history.txt
+glob:indra/newview/search_history.txt
+glob:indra/newview/filters.xml
+glob:indra/newview/avatar_icons_cache.txt