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/user32/display.cpp

    r9974 r21916  
    2727#define NRMODES 5
    2828#define NRDEPTHS 4
    29 struct {
    30         int w,h;
     29static struct {
     30    int w,h;
    3131} modes[NRMODES]={{512,384},{640,400},{640,480},{800,600},{1024,768}};
    3232int depths[4] = {8,16,24,32};
Note: See TracChangeset for help on using the changeset viewer.