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/windllpe2lx.h

    r10397 r21916  
    1313#define __WINDLLPE2LX_H__
    1414
    15 #include <windllbase.h>
    16 #include <winimagepe2lx.h>
     15#include "windllbase.h"
     16#include "winimagepe2lx.h"
    1717
    1818/**
     
    2525public:
    2626    /** @cat Constructor/Destructor */
    27     Win32Pe2LxDll(HINSTANCE hinstance, BOOL fWin32k) throw(ULONG);
     27    Win32Pe2LxDll(HINSTANCE hinstance, BOOL fWin32k);
    2828    virtual     ~Win32Pe2LxDll();
    2929    DWORD       init();
Note: See TracChangeset for help on using the changeset viewer.