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/shlwapi/shlstub.cpp

    r21494 r21916  
    2929#include <heapstring.h>
    3030#include <misc.h>
    31 #include <win\shell.h>
    32 #include <win\winerror.h>
     31#include <win/shell.h>
     32#include <win/winerror.h>
    3333
    3434
    … …  
    3838/*****************************************************************************
    3939 * Name      : StrFromTimeIntervalA
    40  * Purpose   : 
     40 * Purpose   :
    4141 * Parameters:
    4242 * Variables :
    4343 * Result    :
    44  * Remark    : 
     44 * Remark    :
    4545 * Status    : UNTESTED
    4646 *
    … …  
    5151{
    5252  dprintf(("not yet implemented"));
    53  
     53
    5454  return NULL;
    5555}
    … …  
    5858/*****************************************************************************
    5959 * Name      : StrFromTimeIntervalW
    60  * Purpose   : 
     60 * Purpose   :
    6161 * Parameters:
    6262 * Variables :
    6363 * Result    :
    64  * Remark    : 
     64 * Remark    :
    6565 * Status    : UNTESTED
    6666 *
    … …  
    7171{
    7272  dprintf(("not yet implemented"));
    73  
     73
    7474  return NULL;
    7575}
Note: See TracChangeset for help on using the changeset viewer.