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

    r1454 r21916  
    77#include <winaccel.h>
    88#include <wincursor.h>
    9 #include <winimagebase.h>
     9#include "winimagebase.h"
    1010
    1111void *ConvertAccelerator(WINACCEL *accdata, int size, int cp = 0);
Note: See TracChangeset for help on using the changeset viewer.