diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-02-03 17:56:26 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-02-03 17:56:26 +0000 |
| commit | e188badaf29a1a02307f93864eed6737096bd9a1 (patch) | |
| tree | 767259ad3385fd9ede9722e04752bea008469f8c /indra/newview/installers | |
| parent | 4ad54702fce32905402cb6055c085ac14de188a2 (diff) | |
QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314
Whew.
Diffstat (limited to 'indra/newview/installers')
| -rw-r--r-- | indra/newview/installers/windows/install_icon.BMP | bin | 0 -> 262198 bytes | |||
| -rw-r--r-- | indra/newview/installers/windows/install_icon.ico | bin | 0 -> 25214 bytes | |||
| -rw-r--r-- | indra/newview/installers/windows/installer_template.nsi | 4 | ||||
| -rw-r--r-- | indra/newview/installers/windows/uninstall_icon.BMP | bin | 0 -> 262198 bytes | |||
| -rw-r--r-- | indra/newview/installers/windows/uninstall_icon.ico | bin | 0 -> 25214 bytes |
5 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/installers/windows/install_icon.BMP b/indra/newview/installers/windows/install_icon.BMP Binary files differnew file mode 100644 index 0000000000..09df573870 --- /dev/null +++ b/indra/newview/installers/windows/install_icon.BMP diff --git a/indra/newview/installers/windows/install_icon.ico b/indra/newview/installers/windows/install_icon.ico Binary files differnew file mode 100644 index 0000000000..1e00530c90 --- /dev/null +++ b/indra/newview/installers/windows/install_icon.ico diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 0a68d6badc..483568f974 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -68,8 +68,8 @@ Name ${INSTNAME} SubCaption 0 $(LicenseSubTitleSetup) ; override "license agreement" text BrandingText " " ; bottom of window text -Icon %%SOURCE%%\res\install_icon.ico ; our custom icon -UninstallIcon %%SOURCE%%\res\uninstall_icon.ico ; our custom icon +Icon %%SOURCE%%\installers\windows\install_icon.ico +UninstallIcon %%SOURCE%%\installers\windows\uninstall_icon.ico WindowIcon on ; show our icon in left corner BGGradient off ; no big background window CRCCheck on ; make sure CRC is OK diff --git a/indra/newview/installers/windows/uninstall_icon.BMP b/indra/newview/installers/windows/uninstall_icon.BMP Binary files differnew file mode 100644 index 0000000000..562b56676a --- /dev/null +++ b/indra/newview/installers/windows/uninstall_icon.BMP diff --git a/indra/newview/installers/windows/uninstall_icon.ico b/indra/newview/installers/windows/uninstall_icon.ico Binary files differnew file mode 100644 index 0000000000..c4ec6c70bd --- /dev/null +++ b/indra/newview/installers/windows/uninstall_icon.ico |
