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

    r21642 r21916  
    2323#include <misc.h>
    2424#include <heapstring.h>
    25 #include <win32wbase.h>
     25#include "win32wbase.h"
    2626#include "wndmsg.h"
    2727#include "oslibwin.h"
    … …  
    3737#include "controls.h"
    3838#include "pmwindow.h"
    39 #include <menu.h>
     39#include "menu.h"
    4040
    4141#define DBG_LOCALLOG    DBG_win32wbasenonclient
Note: See TracChangeset for help on using the changeset viewer.