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/ddraw/os2fsdd.cpp

    r6646 r21916  
    1515#include <misc.h>
    1616
    17 #include <svgadefs.h>
     17#include "svgadefs.h"
    1818
    1919#include "os2fsdd.h"
    … …  
    5353static ULONG ulTotalModes;
    5454
    55 static bIsInFS = FALSE;
     55static BOOL bIsInFS = FALSE;
    5656
    5757/*
Note: See TracChangeset for help on using the changeset viewer.