diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-30 23:51:33 +0000 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-30 23:51:33 +0000 |
commit | af8c2bc94868e056908b4ae2fc285925cd68b56b (patch) | |
tree | 2fc5e74073317ecc3e7b8e64b7c3784e88ba5099 /indra/newview/icons/project | |
parent | 2df0a2494691ebfdd305e6a5ee280dd758a1b337 (diff) | |
parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) |
Merge. Pull viewer-release to get the new version scheme changes.
Diffstat (limited to 'indra/newview/icons/project')
-rwxr-xr-x[-rw-r--r--] | indra/newview/icons/project/secondlife.icns | bin | 235133 -> 235133 bytes |
-rwxr-xr-x[-rw-r--r--] | indra/newview/icons/project/secondlife.ico | bin | 77791 -> 77791 bytes |
-rwxr-xr-x[-rw-r--r--] | indra/newview/icons/project/secondlife_128.png | bin | 17706 -> 17706 bytes |
-rwxr-xr-x[-rw-r--r--] | indra/newview/icons/project/secondlife_16.png | bin | 3471 -> 3471 bytes |
-rwxr-xr-x[-rw-r--r--] | indra/newview/icons/project/secondlife_256.BMP | bin | 196662 -> 196662 bytes |
-rwxr-xr-x[-rw-r--r--] | indra/newview/icons/project/secondlife_256.png | bin | 48488 -> 48488 bytes |
-rwxr-xr-x[-rw-r--r--] | indra/newview/icons/project/secondlife_32.png | bin | 4675 -> 4675 bytes |
-rwxr-xr-x[-rw-r--r--] | indra/newview/icons/project/secondlife_48.png | bin | 6195 -> 6195 bytes |
-rwxr-xr-x[-rw-r--r--] | indra/newview/icons/project/secondlife_512.png | bin | 149145 -> 149145 bytes |
9 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/icons/project/secondlife.icns b/indra/newview/icons/project/secondlife.icns Binary files differindex d6e26a8ed9..d6e26a8ed9 100644..100755 --- a/indra/newview/icons/project/secondlife.icns +++ b/indra/newview/icons/project/secondlife.icns diff --git a/indra/newview/icons/project/secondlife.ico b/indra/newview/icons/project/secondlife.ico Binary files differindex ebb27e5325..ebb27e5325 100644..100755 --- a/indra/newview/icons/project/secondlife.ico +++ b/indra/newview/icons/project/secondlife.ico diff --git a/indra/newview/icons/project/secondlife_128.png b/indra/newview/icons/project/secondlife_128.png Binary files differindex d67b8228f9..d67b8228f9 100644..100755 --- a/indra/newview/icons/project/secondlife_128.png +++ b/indra/newview/icons/project/secondlife_128.png diff --git a/indra/newview/icons/project/secondlife_16.png b/indra/newview/icons/project/secondlife_16.png Binary files differindex 91493a033c..91493a033c 100644..100755 --- a/indra/newview/icons/project/secondlife_16.png +++ b/indra/newview/icons/project/secondlife_16.png diff --git a/indra/newview/icons/project/secondlife_256.BMP b/indra/newview/icons/project/secondlife_256.BMP Binary files differindex cd890725f8..cd890725f8 100644..100755 --- a/indra/newview/icons/project/secondlife_256.BMP +++ b/indra/newview/icons/project/secondlife_256.BMP diff --git a/indra/newview/icons/project/secondlife_256.png b/indra/newview/icons/project/secondlife_256.png Binary files differindex cccfaf7cba..cccfaf7cba 100644..100755 --- a/indra/newview/icons/project/secondlife_256.png +++ b/indra/newview/icons/project/secondlife_256.png diff --git a/indra/newview/icons/project/secondlife_32.png b/indra/newview/icons/project/secondlife_32.png Binary files differindex ad7b33f789..ad7b33f789 100644..100755 --- a/indra/newview/icons/project/secondlife_32.png +++ b/indra/newview/icons/project/secondlife_32.png diff --git a/indra/newview/icons/project/secondlife_48.png b/indra/newview/icons/project/secondlife_48.png Binary files differindex 104a931fbc..104a931fbc 100644..100755 --- a/indra/newview/icons/project/secondlife_48.png +++ b/indra/newview/icons/project/secondlife_48.png diff --git a/indra/newview/icons/project/secondlife_512.png b/indra/newview/icons/project/secondlife_512.png Binary files differindex 74e2fa9bc6..74e2fa9bc6 100644..100755 --- a/indra/newview/icons/project/secondlife_512.png +++ b/indra/newview/icons/project/secondlife_512.png |