summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2012-05-29 20:41:10 +0000
committerDon Kjer <don@lindenlab.com>2012-05-29 20:41:10 +0000
commit2d3790b2396534de096244bf7b7660ec5ec3a139 (patch)
tree1cbe6616b0f1ef728370b73ad453857caf2eb53e /.hgignore
parent2a62ca5b96d08ad2f24e8a60e161657a7222aba6 (diff)
parenta519e34f02b4b2663fe082ba9ad12f1b423669cb (diff)
Merge ssh://hg@bitbucket.org/lindenlab/viewer-release -> viewer-eventapi-fixes
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