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/ddraw/wndproc.c

    r9459 r21916  
    107107                           "WINE_DDRAW", "DirectDraw",
    108108                           WS_POPUP, 0, 0, dwWidth, dwHeight,
    109                            GetDesktopWindow(), 0, 0, hwndOwner);
     109                           GetDesktopWindow(), 0, 0, (LPVOID)hwndOwner);
    110110
    111111    SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0,
Note: See TracChangeset for help on using the changeset viewer.