diff options
| author | Cinder <cinder.roxley@phoenixviewer.com> | 2014-06-07 14:14:29 -0600 |
|---|---|---|
| committer | Cinder <cinder.roxley@phoenixviewer.com> | 2014-06-07 14:14:29 -0600 |
| commit | 79e0e7d2980b28660716f43d0f0518a107117e83 (patch) | |
| tree | a5d506aa55aa6970b46ff1e493b6d5f9cb410470 /indra/newview/SecondLife.nib | |
| parent | e6b20328c2e25223359dede17357682b5b4e7ea1 (diff) | |
| parent | 98720c3cec8f1ab4af5e66f9d9b7bb9c277b78f1 (diff) | |
Merge upstream
Diffstat (limited to 'indra/newview/SecondLife.nib')
| -rw-r--r-- | indra/newview/SecondLife.nib | bin | 12348 -> 12345 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/SecondLife.nib b/indra/newview/SecondLife.nib Binary files differindex 8b99b5a770..c4ddca50dc 100644 --- a/indra/newview/SecondLife.nib +++ b/indra/newview/SecondLife.nib |