diff options
author | Oz Linden <oz@lindenlab.com> | 2013-06-13 15:28:13 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-06-13 15:28:13 -0400 |
commit | 2268bf38339178f93b317693c0a6808807301d64 (patch) | |
tree | 0a17c21975babce8422b9b62a1683947f5a58f2c /indra/newview/icons/test | |
parent | d233d8836b610b5e5ca76a1e3bb4d63dc3592e66 (diff) | |
parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) |
merge changes for 3.5.3-release
Diffstat (limited to 'indra/newview/icons/test')
-rwxr-xr-x[-rw-r--r--] | indra/newview/icons/test/secondlife.icns | bin | 232905 -> 232905 bytes |
-rwxr-xr-x[-rw-r--r--] | indra/newview/icons/test/secondlife.ico | bin | 76861 -> 76861 bytes |
-rwxr-xr-x[-rw-r--r--] | indra/newview/icons/test/secondlife_128.png | bin | 17156 -> 17156 bytes |
-rwxr-xr-x[-rw-r--r--] | indra/newview/icons/test/secondlife_16.png | bin | 3471 -> 3471 bytes |
-rwxr-xr-x[-rw-r--r--] | indra/newview/icons/test/secondlife_256.BMP | bin | 196662 -> 196662 bytes |
-rwxr-xr-x[-rw-r--r--] | indra/newview/icons/test/secondlife_256.png | bin | 47522 -> 47522 bytes |
-rwxr-xr-x[-rw-r--r--] | indra/newview/icons/test/secondlife_32.png | bin | 4644 -> 4644 bytes |
-rwxr-xr-x[-rw-r--r--] | indra/newview/icons/test/secondlife_48.png | bin | 6115 -> 6115 bytes |
-rwxr-xr-x[-rw-r--r--] | indra/newview/icons/test/secondlife_512.png | bin | 146971 -> 146971 bytes |
9 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/icons/test/secondlife.icns b/indra/newview/icons/test/secondlife.icns Binary files differindex eb8d16a7e7..eb8d16a7e7 100644..100755 --- a/indra/newview/icons/test/secondlife.icns +++ b/indra/newview/icons/test/secondlife.icns diff --git a/indra/newview/icons/test/secondlife.ico b/indra/newview/icons/test/secondlife.ico Binary files differindex ceb8e8e6eb..ceb8e8e6eb 100644..100755 --- a/indra/newview/icons/test/secondlife.ico +++ b/indra/newview/icons/test/secondlife.ico diff --git a/indra/newview/icons/test/secondlife_128.png b/indra/newview/icons/test/secondlife_128.png Binary files differindex 019f65db28..019f65db28 100644..100755 --- a/indra/newview/icons/test/secondlife_128.png +++ b/indra/newview/icons/test/secondlife_128.png diff --git a/indra/newview/icons/test/secondlife_16.png b/indra/newview/icons/test/secondlife_16.png Binary files differindex 91493a033c..91493a033c 100644..100755 --- a/indra/newview/icons/test/secondlife_16.png +++ b/indra/newview/icons/test/secondlife_16.png diff --git a/indra/newview/icons/test/secondlife_256.BMP b/indra/newview/icons/test/secondlife_256.BMP Binary files differindex e23fcfdbe9..e23fcfdbe9 100644..100755 --- a/indra/newview/icons/test/secondlife_256.BMP +++ b/indra/newview/icons/test/secondlife_256.BMP diff --git a/indra/newview/icons/test/secondlife_256.png b/indra/newview/icons/test/secondlife_256.png Binary files differindex f402424c51..f402424c51 100644..100755 --- a/indra/newview/icons/test/secondlife_256.png +++ b/indra/newview/icons/test/secondlife_256.png diff --git a/indra/newview/icons/test/secondlife_32.png b/indra/newview/icons/test/secondlife_32.png Binary files differindex 80d6efe13d..80d6efe13d 100644..100755 --- a/indra/newview/icons/test/secondlife_32.png +++ b/indra/newview/icons/test/secondlife_32.png diff --git a/indra/newview/icons/test/secondlife_48.png b/indra/newview/icons/test/secondlife_48.png Binary files differindex bba938feba..bba938feba 100644..100755 --- a/indra/newview/icons/test/secondlife_48.png +++ b/indra/newview/icons/test/secondlife_48.png diff --git a/indra/newview/icons/test/secondlife_512.png b/indra/newview/icons/test/secondlife_512.png Binary files differindex 10ff65312b..10ff65312b 100644..100755 --- a/indra/newview/icons/test/secondlife_512.png +++ b/indra/newview/icons/test/secondlife_512.png |