Changeset 9406 in orxonox.OLD for trunk/src/lib/gui/gl/glmenu

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:

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

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

@@ -27 +27 @@
 CREATE_FACTORY(GLMenuImageScreen, CL_GLMENU_IMAGE_SCREEN);
 
-using namespace std;
+
 /**
  * @param root The Element to load the GLMenu from