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/tools/common/kError.cpp

    r8003 r21916  
    1616*   Header Files                                                               *
    1717*******************************************************************************/
     18#if defined (__EMX__) && !defined (USE_OS2_TOOLKIT_HEADERS)
     19#define __OS2DEF__
     20#endif
    1821#include <os2.h>
     22
    1923#include <string.h>
    2024#include <stdio.h>
Note: See TracChangeset for help on using the changeset viewer.