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/gdi32/font.cpp

    r10612 r21916  
    3636#include "unicode.h"
    3737#include <heapstring.h>
    38 #include <win\options.h>
     38#include <win/options.h>
    3939#include <wprocess.h>
    4040#include <odininst.h>
Note: See TracChangeset for help on using the changeset viewer.