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/release | |
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/release')
-rw-r--r--[-rwxr-xr-x] | indra/newview/icons/release/secondlife.icns | bin | 228390 -> 228390 bytes |
-rw-r--r--[-rwxr-xr-x] | indra/newview/icons/release/secondlife.ico | bin | 77552 -> 77552 bytes |
-rw-r--r--[-rwxr-xr-x] | indra/newview/icons/release/secondlife_128.png | bin | 15184 -> 15184 bytes |
-rw-r--r--[-rwxr-xr-x] | indra/newview/icons/release/secondlife_16.png | bin | 1009 -> 1009 bytes |
-rw-r--r--[-rwxr-xr-x] | indra/newview/icons/release/secondlife_256.BMP | bin | 196662 -> 196662 bytes |
-rw-r--r--[-rwxr-xr-x] | indra/newview/icons/release/secondlife_256.png | bin | 47740 -> 47740 bytes |
-rw-r--r--[-rwxr-xr-x] | indra/newview/icons/release/secondlife_32.png | bin | 2237 -> 2237 bytes |
-rw-r--r--[-rwxr-xr-x] | indra/newview/icons/release/secondlife_48.png | bin | 3748 -> 3748 bytes |
-rw-r--r--[-rwxr-xr-x] | indra/newview/icons/release/secondlife_512.png | bin | 154396 -> 154396 bytes |
9 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/icons/release/secondlife.icns b/indra/newview/icons/release/secondlife.icns Binary files differindex e15e34140d..e15e34140d 100755..100644 --- a/indra/newview/icons/release/secondlife.icns +++ b/indra/newview/icons/release/secondlife.icns diff --git a/indra/newview/icons/release/secondlife.ico b/indra/newview/icons/release/secondlife.ico Binary files differindex 28bf1e7664..28bf1e7664 100755..100644 --- a/indra/newview/icons/release/secondlife.ico +++ b/indra/newview/icons/release/secondlife.ico diff --git a/indra/newview/icons/release/secondlife_128.png b/indra/newview/icons/release/secondlife_128.png Binary files differindex 4c9544f498..4c9544f498 100755..100644 --- a/indra/newview/icons/release/secondlife_128.png +++ b/indra/newview/icons/release/secondlife_128.png diff --git a/indra/newview/icons/release/secondlife_16.png b/indra/newview/icons/release/secondlife_16.png Binary files differindex bb3168b8be..bb3168b8be 100755..100644 --- a/indra/newview/icons/release/secondlife_16.png +++ b/indra/newview/icons/release/secondlife_16.png diff --git a/indra/newview/icons/release/secondlife_256.BMP b/indra/newview/icons/release/secondlife_256.BMP Binary files differindex 74deedd7d3..74deedd7d3 100755..100644 --- a/indra/newview/icons/release/secondlife_256.BMP +++ b/indra/newview/icons/release/secondlife_256.BMP diff --git a/indra/newview/icons/release/secondlife_256.png b/indra/newview/icons/release/secondlife_256.png Binary files differindex bece338a90..bece338a90 100755..100644 --- a/indra/newview/icons/release/secondlife_256.png +++ b/indra/newview/icons/release/secondlife_256.png diff --git a/indra/newview/icons/release/secondlife_32.png b/indra/newview/icons/release/secondlife_32.png Binary files differindex 736359c147..736359c147 100755..100644 --- a/indra/newview/icons/release/secondlife_32.png +++ b/indra/newview/icons/release/secondlife_32.png diff --git a/indra/newview/icons/release/secondlife_48.png b/indra/newview/icons/release/secondlife_48.png Binary files differindex 07d39ae585..07d39ae585 100755..100644 --- a/indra/newview/icons/release/secondlife_48.png +++ b/indra/newview/icons/release/secondlife_48.png diff --git a/indra/newview/icons/release/secondlife_512.png b/indra/newview/icons/release/secondlife_512.png Binary files differindex 53d1643f45..53d1643f45 100755..100644 --- a/indra/newview/icons/release/secondlife_512.png +++ b/indra/newview/icons/release/secondlife_512.png |