Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2992 in orxonox.OLD for orxonox/branches/osX/importer/framework.cc


Ignore:
Timestamp:
Nov 26, 2004, 10:03:01 AM (20 years ago)
Author:
bensch
Message:

orxonox/branches/osX: merged back from trunk again. command: svn merge trunk/ branches/osX/ -r 2977:HEAD. All conflicts resolved in favor of trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orxonox/branches/osX/importer/framework.cc

    r2977 r2992  
    4343  // Create a new OpenGL window with the title "Cone3D Basecode" at
    4444  // 640x480x32, fullscreen and check for errors along the way
    45   if(wHandler.CreateGLWindow("Whandler Basecode", 500, 375, 32, FALSE) == FALSE)
     45  if(wHandler.CreateGLWindow("Whandler Basecode", 640, 480, 32, FALSE) == FALSE)
    4646  {
    4747    // If an error is found, display a message, kill the GL and SDL screens (if they were created) and exit
Note: See TracChangeset for help on using the changeset viewer.