summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-06-07 22:30:54 -0700
committerMerov Linden <merov@lindenlab.com>2012-06-07 22:30:54 -0700
commitbc54f1bb89452467ca8b652e4b961444d9c4be8d (patch)
treeb5aac588bc7ec1506456eaf5967e9a7930b42fc0 /.hgignore
parent05d721cecfa0c20a6fd8498a18f36cde7014248e (diff)
parenta519e34f02b4b2663fe082ba9ad12f1b423669cb (diff)
Merge : pull from lindenlab/viewer-release
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