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/beta | |
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/beta')
-rw-r--r--[-rwxr-xr-x] | indra/newview/icons/beta/secondlife.icns | bin | 242261 -> 242261 bytes |
-rw-r--r--[-rwxr-xr-x] | indra/newview/icons/beta/secondlife.ico | bin | 78692 -> 78692 bytes |
-rw-r--r--[-rwxr-xr-x] | indra/newview/icons/beta/secondlife_128.png | bin | 16200 -> 16200 bytes |
-rw-r--r--[-rwxr-xr-x] | indra/newview/icons/beta/secondlife_16.png | bin | 1020 -> 1020 bytes |
-rw-r--r--[-rwxr-xr-x] | indra/newview/icons/beta/secondlife_256.BMP | bin | 196662 -> 196662 bytes |
-rw-r--r--[-rwxr-xr-x] | indra/newview/icons/beta/secondlife_256.png | bin | 49119 -> 49119 bytes |
-rw-r--r--[-rwxr-xr-x] | indra/newview/icons/beta/secondlife_32.png | bin | 2252 -> 2252 bytes |
-rw-r--r--[-rwxr-xr-x] | indra/newview/icons/beta/secondlife_48.png | bin | 3940 -> 3940 bytes |
-rw-r--r--[-rwxr-xr-x] | indra/newview/icons/beta/secondlife_512.png | bin | 157618 -> 157618 bytes |
9 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/icons/beta/secondlife.icns b/indra/newview/icons/beta/secondlife.icns Binary files differindex 1fa50547bb..1fa50547bb 100755..100644 --- a/indra/newview/icons/beta/secondlife.icns +++ b/indra/newview/icons/beta/secondlife.icns diff --git a/indra/newview/icons/beta/secondlife.ico b/indra/newview/icons/beta/secondlife.ico Binary files differindex 9bdd21b904..9bdd21b904 100755..100644 --- a/indra/newview/icons/beta/secondlife.ico +++ b/indra/newview/icons/beta/secondlife.ico diff --git a/indra/newview/icons/beta/secondlife_128.png b/indra/newview/icons/beta/secondlife_128.png Binary files differindex af5ae63335..af5ae63335 100755..100644 --- a/indra/newview/icons/beta/secondlife_128.png +++ b/indra/newview/icons/beta/secondlife_128.png diff --git a/indra/newview/icons/beta/secondlife_16.png b/indra/newview/icons/beta/secondlife_16.png Binary files differindex 9e6305d98f..9e6305d98f 100755..100644 --- a/indra/newview/icons/beta/secondlife_16.png +++ b/indra/newview/icons/beta/secondlife_16.png diff --git a/indra/newview/icons/beta/secondlife_256.BMP b/indra/newview/icons/beta/secondlife_256.BMP Binary files differindex 97bd67d3d6..97bd67d3d6 100755..100644 --- a/indra/newview/icons/beta/secondlife_256.BMP +++ b/indra/newview/icons/beta/secondlife_256.BMP diff --git a/indra/newview/icons/beta/secondlife_256.png b/indra/newview/icons/beta/secondlife_256.png Binary files differindex b0814fc180..b0814fc180 100755..100644 --- a/indra/newview/icons/beta/secondlife_256.png +++ b/indra/newview/icons/beta/secondlife_256.png diff --git a/indra/newview/icons/beta/secondlife_32.png b/indra/newview/icons/beta/secondlife_32.png Binary files differindex a00b3cf53c..a00b3cf53c 100755..100644 --- a/indra/newview/icons/beta/secondlife_32.png +++ b/indra/newview/icons/beta/secondlife_32.png diff --git a/indra/newview/icons/beta/secondlife_48.png b/indra/newview/icons/beta/secondlife_48.png Binary files differindex 551587b1cd..551587b1cd 100755..100644 --- a/indra/newview/icons/beta/secondlife_48.png +++ b/indra/newview/icons/beta/secondlife_48.png diff --git a/indra/newview/icons/beta/secondlife_512.png b/indra/newview/icons/beta/secondlife_512.png Binary files differindex 99226de74e..99226de74e 100755..100644 --- a/indra/newview/icons/beta/secondlife_512.png +++ b/indra/newview/icons/beta/secondlife_512.png |