Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/shell32/shelllink.c

    r10547 r21916  
    264264
    265265#ifdef __WIN32OS2__
    266 static BOOL SaveIconFileAsOS2ICO(char *szFileName, char *szXPMFileName)
     266static BOOL SaveIconFileAsOS2ICO(const char *szFileName, const char *szXPMFileName)
    267267{
    268268    HFILE fXPMFile = NULL, fICOFile = NULL;
Note: See TracChangeset for help on using the changeset viewer.