Changeset 5750 in orxonox.OLD for trunk/src/lib/gui

Timestamp:

Nov 24, 2005, 12:13:22 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the WorldEntities into the Trunk.
Merged with command:
svn merge branches/world_entities/ trunk/ -r5516:HEAD

conflics from world_entities changed in favor of branches/world_entity
all other conflict in favor of the trunk

File:

• trunk/src/lib/gui/gl_gui/glmenu/glmenu_imagescreen.cc (modified) (1 diff)

trunk/src/lib/gui/gl_gui/glmenu/glmenu_imagescreen.cc

@@ -25 +25 @@
 #include "load_param.h"
 
-CREATE_FACTORY(GLMenuImageScreen);
+CREATE_FACTORY(GLMenuImageScreen, CL_GLMENU_IMAGE_SCREEN);
 
 using namespace std;