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/include/win/winuser.h

    r21553 r21916  
    32053205#define DI_DEFAULTSIZE          8
    32063206
    3207   /* misc messages */
     3207/* misc messages */
    32083208#define WM_NULL             0x0000
    3209 #define WM_CPL_LAUNCH       (WM_USER + 1000)
    3210 #define WM_CPL_LAUNCHED     (WM_USER + 1001)
    32113209
    32123210/* WM_NOTIFYFORMAT commands and return values */
Note: See TracChangeset for help on using the changeset viewer.