summaryrefslogtreecommitdiff
path: root/indra/newview/installers/windows
diff options
context:
space:
mode:
authorskolb <none@none>2010-03-08 14:54:54 -0800
committerskolb <none@none>2010-03-08 14:54:54 -0800
commit78abe4f5ffb02e14cd98f049b8100d20a82f3b1c (patch)
tree0c471654bd00737375e91f040d758716c82bffb2 /indra/newview/installers/windows
parentf39a87ef8384ede25a6597e678ac7609e9e64cc5 (diff)
parent2aa9ecb60235c96a42f3719fab9dbc6ea1bf50db (diff)
Local merge
Diffstat (limited to 'indra/newview/installers/windows')
-rw-r--r--indra/newview/installers/windows/install_icon.icobin25214 -> 367958 bytes
-rw-r--r--indra/newview/installers/windows/uninstall_icon.icobin25214 -> 367958 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/installers/windows/install_icon.ico b/indra/newview/installers/windows/install_icon.ico
index 1e00530c90..efe6c4f323 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.ico b/indra/newview/installers/windows/uninstall_icon.ico
index c4ec6c70bd..05e1546860 100644
--- a/indra/newview/installers/windows/uninstall_icon.ico
+++ b/indra/newview/installers/windows/uninstall_icon.ico
Binary files differ