diff options
| author | callum_linden <none@none> | 2016-05-19 11:00:03 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2016-05-19 11:00:03 -0700 |
| commit | 9c4ed8d1138de86041b740139c4deec1bc6bf8ee (patch) | |
| tree | d7452bc7faeae01964f13faaa16e2812b27ba93c /indra/newview/icons/test | |
| parent | e6fb7564b02ba73c8a402efaca65cb944ce7bef2 (diff) | |
| parent | c2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff) | |
Automated merge with tip of viewer-release to pick up 4.0.5
Diffstat (limited to 'indra/newview/icons/test')
| -rw-r--r--[-rwxr-xr-x] | indra/newview/icons/test/secondlife.icns | bin | 232905 -> 232905 bytes |
| -rw-r--r--[-rwxr-xr-x] | indra/newview/icons/test/secondlife.ico | bin | 76861 -> 76861 bytes |
| -rw-r--r--[-rwxr-xr-x] | indra/newview/icons/test/secondlife_128.png | bin | 15058 -> 15058 bytes |
| -rw-r--r--[-rwxr-xr-x] | indra/newview/icons/test/secondlife_16.png | bin | 956 -> 956 bytes |
| -rw-r--r--[-rwxr-xr-x] | indra/newview/icons/test/secondlife_256.BMP | bin | 196662 -> 196662 bytes |
| -rw-r--r--[-rwxr-xr-x] | indra/newview/icons/test/secondlife_256.png | bin | 47320 -> 47320 bytes |
| -rw-r--r--[-rwxr-xr-x] | indra/newview/icons/test/secondlife_32.png | bin | 2130 -> 2130 bytes |
| -rw-r--r--[-rwxr-xr-x] | indra/newview/icons/test/secondlife_48.png | bin | 3630 -> 3630 bytes |
| -rw-r--r--[-rwxr-xr-x] | indra/newview/icons/test/secondlife_512.png | bin | 153502 -> 153502 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 100755..100644 --- 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 100755..100644 --- 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 486772b6d3..486772b6d3 100755..100644 --- 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 7d3d74b534..7d3d74b534 100755..100644 --- 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 100755..100644 --- 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 56c781788d..56c781788d 100755..100644 --- 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 476029db61..476029db61 100755..100644 --- 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 d7de7849f9..d7de7849f9 100755..100644 --- 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 a4b1e4974c..a4b1e4974c 100755..100644 --- a/indra/newview/icons/test/secondlife_512.png +++ b/indra/newview/icons/test/secondlife_512.png |
