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/shell32/systray_os2ex.c

    r21602 r21916  
    1717// declare function pointers for dynamic linking to xsystray DLL
    1818#define XSTAPI_FPTRS_STATIC
    19 #include <xsystray.h>
     19#include "xsystray.h"
    2020
    2121#include "systray_os2.h"
Note: See TracChangeset for help on using the changeset viewer.