2010-04-07 10:37 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

- package/harbour.ico
  + package/harb_win.ico
  * package/mpkg_win.nsi
  * package/winuni/mpkg_win_uni.nsi
  * utils/hbrun/hbrun.rc
  * utils/hbrun/hbrun.hbp
    * Renamed .ico to make it obvious that it is a Windows icon file.

harbour/ChangeLog

@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-04-07 10:37 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  - package/harbour.ico
+  + package/harb_win.ico
+  * package/mpkg_win.nsi
+  * package/winuni/mpkg_win_uni.nsi
+  * utils/hbrun/hbrun.rc
+  * utils/hbrun/hbrun.hbp
+    * Renamed .ico to make it obvious that it is a Windows icon file.
+
 2010-04-07 05:55 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
   * harbour/contrib/hbcairo/tests/hellow.c
     * HB_SETCODEPAGE() -> HB_CDPSELECT()

harbour/package/mpkg_win.nsi

@@ -20,7 +20,7 @@
   !define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
   !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
   !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\doc\readme.txt"
-  !define MUI_ICON "harbour.ico"
+  !define MUI_ICON "harb_win.ico"
 
 SetDateSave on
 SetDatablockOptimize on

harbour/package/winuni/mpkg_win_uni.nsi

@@ -19,7 +19,7 @@ SetCompressor /solid lzma
   !define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
   !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
   !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\doc\readme.txt"
-  !define MUI_ICON "..\harbour.ico"
+  !define MUI_ICON "..\harb_win.ico"
 
 SetDateSave on
 SetDatablockOptimize on

harbour/utils/hbrun/hbrun.hbp

@@ -14,4 +14,4 @@ hbrun.prg
 -lhbpp
 -lhbcommon
 
--icon={allwin|os2}../../package/harbour.ico
+-icon={allwin}../../package/harb_win.ico

harbour/utils/hbrun/hbrun.rc

@@ -3,7 +3,7 @@
  */
 
 #if defined( OS2 ) || defined( __OS2__ ) || defined( OS_2 )
-ICON 1 DISCARDABLE "../../../../../package/harbour.ico"
+ICON 1 DISCARDABLE "../../../../../package/harb_win.ico"
 #else
-ICON1 ICON DISCARDABLE "../../../../../package/harbour.ico"
+ICON1 ICON DISCARDABLE "../../../../../package/harb_win.ico"
 #endif