summaryrefslogtreecommitdiff
path: root/indra/newview/installers/windows
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2021-04-29 11:40:22 -0600
committerDave Houlton <euclid@lindenlab.com>2021-04-29 11:40:22 -0600
commit2386125ae0db3218c620667b05449cd25ee05ad5 (patch)
treedeee2618a9c33681e038845605db6719babd1d77 /indra/newview/installers/windows
parent18316191cd7d1e1f8c3a4940eb5ed6cdf2695575 (diff)
parentce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff)
Merge master into DV525-merge-6.4.19
Diffstat (limited to 'indra/newview/installers/windows')
-rw-r--r--indra/newview/installers/windows/install_icon.BMPbin262198 -> 131128 bytes
-rw-r--r--indra/newview/installers/windows/install_icon.icobin367958 -> 32988 bytes
-rw-r--r--indra/newview/installers/windows/uninstall_icon.BMPbin262198 -> 131128 bytes
-rw-r--r--indra/newview/installers/windows/uninstall_icon.icobin367958 -> 32988 bytes
4 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/installers/windows/install_icon.BMP b/indra/newview/installers/windows/install_icon.BMP
index 09df573870..dba2636803 100644
--- a/indra/newview/installers/windows/install_icon.BMP
+++ b/indra/newview/installers/windows/install_icon.BMP
Binary files differ
diff --git a/indra/newview/installers/windows/install_icon.ico b/indra/newview/installers/windows/install_icon.ico
index efe6c4f323..93d4fa54ba 100644
--- a/indra/newview/installers/windows/install_icon.ico
+++ b/indra/newview/installers/windows/install_icon.ico
Binary files differ
diff --git a/indra/newview/installers/windows/uninstall_icon.BMP b/indra/newview/installers/windows/uninstall_icon.BMP
index 562b56676a..dba2636803 100644
--- a/indra/newview/installers/windows/uninstall_icon.BMP
+++ b/indra/newview/installers/windows/uninstall_icon.BMP
Binary files differ
diff --git a/indra/newview/installers/windows/uninstall_icon.ico b/indra/newview/installers/windows/uninstall_icon.ico
index 05e1546860..93d4fa54ba 100644
--- a/indra/newview/installers/windows/uninstall_icon.ico
+++ b/indra/newview/installers/windows/uninstall_icon.ico
Binary files differ