diff options
author | Oz Linden <oz@lindenlab.com> | 2012-03-30 15:56:38 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-03-30 15:56:38 -0400 |
commit | 74d199c1dd10660f72293c84888af412764f1da8 (patch) | |
tree | 0b4c4137abde8283c5a85da08f19de1aea335c2a /.hgignore | |
parent | 3c3ee709677a0c60420eae84a55a7b61113b4949 (diff) | |
parent | 6e4e971fd27826f90c1728c7fd17242083e230fc (diff) |
merge changes for vmrg-233
Diffstat (limited to '.hgignore')
-rw-r--r-- | .hgignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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 |