diff --git a/mozilla/xpinstall/wizard/windows/nsinstall/nsinstall.cpp b/mozilla/xpinstall/wizard/windows/nsinstall/nsinstall.cpp index eda911d6748..71a46b97fa0 100644 --- a/mozilla/xpinstall/wizard/windows/nsinstall/nsinstall.cpp +++ b/mozilla/xpinstall/wizard/windows/nsinstall/nsinstall.cpp @@ -19,6 +19,7 @@ * Reserved. * * Contributors: + * Troy Chevalier * Sean Su */ diff --git a/mozilla/xpinstall/wizard/windows/nsinstall/nsinstall.ico b/mozilla/xpinstall/wizard/windows/nsinstall/nsinstall.ico new file mode 100644 index 00000000000..f8acc71c250 Binary files /dev/null and b/mozilla/xpinstall/wizard/windows/nsinstall/nsinstall.ico differ diff --git a/mozilla/xpinstall/wizard/windows/nsinstall/nsinstall.rc b/mozilla/xpinstall/wizard/windows/nsinstall/nsinstall.rc index af32901cfdd..7b33e15ee4e 100644 --- a/mozilla/xpinstall/wizard/windows/nsinstall/nsinstall.rc +++ b/mozilla/xpinstall/wizard/windows/nsinstall/nsinstall.rc @@ -1,3 +1,5 @@ +//Microsoft Developer Studio generated resource script. +// /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* * The contents of this file are subject to the Netscape Public License @@ -19,11 +21,10 @@ * Reserved. * * Contributors: + * Troy Chevalier * Sean Su */ -//Microsoft Developer Studio generated resource script. -// #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS @@ -86,6 +87,15 @@ END #endif // APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +1 ICON DISCARDABLE "nsinstall.ico" + ///////////////////////////////////////////////////////////////////////////// // // String Table diff --git a/mozilla/xpinstall/wizard/windows/nsinstall/resource.h b/mozilla/xpinstall/wizard/windows/nsinstall/resource.h index 555137a8630..bf8b81a5ea3 100644 --- a/mozilla/xpinstall/wizard/windows/nsinstall/resource.h +++ b/mozilla/xpinstall/wizard/windows/nsinstall/resource.h @@ -1,3 +1,7 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Developer Studio generated include file. +// Used by nsinstall.rc +// /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* * The contents of this file are subject to the Netscape Public License @@ -19,13 +23,10 @@ * Reserved. * * Contributors: + * Troy Chevalier * Sean Su */ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by nsinstall.rc -// #define IDS_PROMPT 1 #define IDS_STATUS_EXTRACTING 2 #define IDS_STATUS_LAUNCHING_SETUP 3 @@ -39,7 +40,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_RESOURCE_VALUE 103 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1003 #define _APS_NEXT_SYMED_VALUE 101