Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jul 12, 2009, 11:58:01 PM (15 years ago)
Author:
rgrieder
Message:

Merged most of the core4 revisions back to the trunk except for:

  • orxonox_cast
  • all the radical changes in the input library
Location:
code/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk

  • code/trunk/src/orxonox/gui/GUIManager.h

    r3196 r3280  
    123123        CEGUI::ResourceProvider*    resourceProvider_;  //!< CEGUI's resource provider
    124124        CEGUI::LuaScriptModule*     scriptModule_;      //!< CEGUI's script module to use Lua
    125         CEGUI::DefaultLogger*       ceguiLogger_;       //!< CEGUI's logger to be able to log CEGUI errors in our log
     125        CEGUI::Logger*              ceguiLogger_;       //!< CEGUI's logger to be able to log CEGUI errors in our log
    126126        CEGUI::System*              guiSystem_;         //!< CEGUI's main system
    127127        lua_State*                  luaState_;          //!< Lua state, access point to the Lua engine
Note: See TracChangeset for help on using the changeset viewer.