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/version/dbglocal.cpp

    r10300 r21916  
    2020USHORT DbgEnabledLvl2VERSION[DBG_MAXFILES] = {0};
    2121
    22 static char *DbgFileNames[DBG_MAXFILES] =
     22static const char *DbgFileNames[DBG_MAXFILES] =
    2323{
    24 "info",
    25 "install",
    26 "resource"
     24    "info",
     25    "install",
     26    "resource"
    2727};
    2828
Note: See TracChangeset for help on using the changeset viewer.