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

    r3925 r21916  
    444444#pragma pack(2)
    445445
    446 struct
     446static struct
    447447{
    448448    WORD           palVersion;
    … …  
    458458DWORD dwCapsRaster;
    459459
    460 struct {
     460static struct {
    461461  BITMAPINFOHEADER bmiHeader;
    462462  RGBQUAD bmiColors[256];
Note: See TracChangeset for help on using the changeset viewer.