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/dbgwrap.cpp

    r21494 r21916  
    1010#include <winnls.h>
    1111#include <ntddk.h>
    12 #include <heapstring.h>
    1312
    1413#define CINTERFACE
    … …  
    2120#include "shellapi.h"
    2221#include "shresdef.h"
     22
     23#include <heapstring.h>
    2324
    2425#define DBGWRAP_MODULE "SHELL32"
Note: See TracChangeset for help on using the changeset viewer.