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

    r10594 r21916  
    391391VOID dumpROP2(INT rop2)
    392392{
    393   CHAR *name;
     393  const char *name;
    394394
    395395  switch (rop2)
    … …  
    549549//******************************************************************************
    550550//******************************************************************************
    551 char *GetDeviceCapsString(int nIndex)
     551const char *GetDeviceCapsString(int nIndex)
    552552{
    553553    switch(nIndex) {
Note: See TracChangeset for help on using the changeset viewer.