| Index: chrome/app/chrome_exe.rc
|
| ===================================================================
|
| --- chrome/app/chrome_exe.rc (revision 23179)
|
| +++ chrome/app/chrome_exe.rc (working copy)
|
| @@ -63,6 +63,7 @@
|
| // remains consistent on all systems.
|
| #if defined(GOOGLE_CHROME_BUILD)
|
| IDR_MAINFRAME ICON "theme\google_chrome\chrome.ico"
|
| +IDR_MAINFRAME_2 ICON "theme\google_chrome\chrome2.ico"
|
| #else
|
| IDR_MAINFRAME ICON "theme\chromium\chromium.ico"
|
| #endif
|
|
|
| Property changes on: chrome\app\chrome_exe.rc
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/chrome/app/chrome_exe.rc:r69-2775
|
| Merged /trunk/src/chrome/app/chrome_exe.rc:r22314
|
|
|
|
|