summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2009-11-25 15:46:30 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2009-11-25 15:46:30 +0200
commitf0e3eec40be91558efdae3051f42fa32f306207c (patch)
tree36ba3eb7516b60c0fb6a4aba6aa3b9c3b7ed8e24 /.hgignore
parentc2c83f3535c5a0bc099528580375afc99ad3b020 (diff)
parent41eb231e6a41da13549e5cbd4cfe6f5efeab74b1 (diff)
Merge from default branch
--HG-- branch : product-engine
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