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/custombuild/guid.c

    r21494 r21916  
    1010#include "shlobj.h"
    1111#include "docobj.h"
    12 #include "..\shell32\shellfolder.h"
     12#include "../shell32/shellfolder.h"
    1313
    1414#include "wine/obj_inplace.h"
    … …  
    1919#include "wine/obj_clientserver.h"
    2020#include "wine/obj_cache.h"
    21 #include "wine\obj_oleaut.h"
    22 #include "wine\obj_olefont.h"
     21#include "wine/obj_oleaut.h"
     22#include "wine/obj_olefont.h"
    2323
    2424#include "wine/obj_oleview.h"
    … …  
    138138        (*pSid)->SubAuthority[7] = nSubAuthority7;
    139139
    140   if(pIdentifierAuthority) 
     140  if(pIdentifierAuthority)
    141141        memcpy((PVOID)&(*pSid)->IdentifierAuthority, (PVOID)pIdentifierAuthority, sizeof(SID_IDENTIFIER_AUTHORITY));
    142142  return TRUE;
Note: See TracChangeset for help on using the changeset viewer.