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/wnetap32/errorlog.cpp

    r6672 r21916  
    3232#include <os2win.h>
    3333#include <misc.h>
     34#include <string.h>
    3435#include <heapstring.h>
    35 #include <string.h>
    3636
    3737#include "oslibnet.h"
Note: See TracChangeset for help on using the changeset viewer.