diff options
author | Baker Linden <baker@lindenlab.com> | 2014-05-08 14:00:55 -0700 |
---|---|---|
committer | Baker Linden <baker@lindenlab.com> | 2014-05-08 14:00:55 -0700 |
commit | 37bfd025aeef7292abb1708577eee80b6e1b91d5 (patch) | |
tree | 3dab7c728f3a4b67eae30cbbf838dec8747c5e6e /.hgignore | |
parent | 1cf659d4481983684c4d5d749d95d56832dbc621 (diff) | |
parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) |
viewer-release merge (to 3.7.8)
Diffstat (limited to '.hgignore')
-rwxr-xr-x | .hgignore | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -75,4 +75,6 @@ glob:indra/newview/filters.xml glob:indra/newview/avatar_icons_cache.txt glob:indra/newview/avatar_lad.log glob:*.diff -#*.rej +indra/newview/pilot.txt +indra/newview/pilot.xml +*.rej |