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/user32/windowword.cpp

    r10119 r21916  
    1212#include <os2win.h>
    1313#include <dbglog.h>
    14 #include <ctrlconf.h>
     14#include "ctrlconf.h"
    1515
    16 #include <win32wbase.h>
     16#include "win32wbase.h"
    1717
    1818#define DBG_LOCALLOG    DBG_windowword
Note: See TracChangeset for help on using the changeset viewer.