summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorcallum <none@none>2012-06-15 14:17:21 -0700
committercallum <none@none>2012-06-15 14:17:21 -0700
commit0ff6275a654eda55662fab8d89d9ff4d278438d8 (patch)
treecc9bee7b3aae707870405fa5ee58589c8d6161f3 /.hgignore
parent4985938269a91387e481731d469a0f1ca34e22a8 (diff)
parenta1d0d67e05c45bdc1a7a8bb0aad79772a2a94f6e (diff)
Merge with tip
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