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/comctl32/propsheet.c

    r10165 r21916  
    171171static BOOL PROPSHEET_DoCommand(HWND hwnd, WORD wID);
    172172
    173 INT_PTR CALLBACK
     173static BOOL CALLBACK
    174174PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
    175175
    … …  
    26902690 *            PROPSHEET_DialogProc
    26912691 */
    2692 INT_PTR CALLBACK
     2692static BOOL CALLBACK
    26932693PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
    26942694{
Note: See TracChangeset for help on using the changeset viewer.