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/install/odininst.cpp

    r21679 r21916  
    4747#include "debugtools.h"
    4848#include <odininst.h>
    49 #include <win\options.h>
     49#include <win/options.h>
    5050#include <versionos2.h>
    5151#include <time.h>
Note: See TracChangeset for help on using the changeset viewer.