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/kernel32/resource.cpp

    r8111 r21916  
    1313#include <os2win.h>
    1414#include <unicode.h>
    15 #include <winimagebase.h>
    16 #include <winexebase.h>
    17 #include <windllbase.h>
     15#include "winimagebase.h"
     16#include "winexebase.h"
     17#include "windllbase.h"
    1818
    1919#define DBG_LOCALLOG    DBG_resource
Note: See TracChangeset for help on using the changeset viewer.