Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
1 deleted
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/win32k/pe2lx/pe2lx.cpp

    r10394 r21916  
    19411941    static SMTE smte;
    19421942    static MTE  mte;
    1943     static     achPage[PAGESIZE];
     1943    static CHAR achPage[PAGESIZE];
    19441944    int         i;
    19451945    APIRET      rc;
    … …  
    52245224        for (i = 0; i < IMAGE_NUMBEROF_DIRECTORY_ENTRIES; i++)
    52255225        {
    5226             char *pszName;
     5226            const char *pszName;
    52275227
    52285228            switch (i)
Note: See TracChangeset for help on using the changeset viewer.