summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2009-11-25 10:49:49 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2009-11-25 10:49:49 +0000
commit664b848bac30a7f3f1177a683e0913c9457dc041 (patch)
treeb284602f6911e31d5ef687e1c06b343ef83627e1 /.hgignore
parent6f4099e413d41ba56a5a339122050122363ca952 (diff)
parent41eb231e6a41da13549e5cbd4cfe6f5efeab74b1 (diff)
merge from trunk.
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