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/urlmon/urlmon.cpp

    r21333 r21916  
    99#include <os2win.h>
    1010#include <odinwrap.h>
    11 #include <heapstring.h>
    1211#include "wtypes.h"
    1312// #include "urlmon.h"
     13
     14#include <heapstring.h>
    1415
    1516/***********************************************************************
Note: See TracChangeset for help on using the changeset viewer.