summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-04-03 11:06:33 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-04-03 11:06:33 -0700
commit36a0a58487063152d8aacdeb22060025fe0021c7 (patch)
tree58a59dee2b88e1e51391987b157a37b3c8cd710b /.hgignore
parent8b5b0ace9bfb83540fbc73376b639180d6d63a3b (diff)
parentfa6add3fcd300b21142e3381f35851b3404ee02a (diff)
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 403b73df6d..bc3020eee4 100644
--- a/.hgignore
+++ b/.hgignore
@@ -67,3 +67,4 @@ glob:indra/newview/filters.xml
glob:indra/newview/avatar_icons_cache.txt
glob:indra/newview/avatar_lad.log
glob:*.diff
+*.rej