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

    r21494 r21916  
    1212#include "olectl.h"
    1313#include "dinput.h"
    14 //#include "..\shell32\shellfolder.h"
     14//#include "../shell32/shellfolder.h"
    1515
    1616#include "wine/obj_inplace.h"
Note: See TracChangeset for help on using the changeset viewer.