Changeset 9406 in orxonox.OLD for trunk/src/lib/graphics/shader.cc

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/graphics/shader.cc (modified) (1 diff)

trunk/src/lib/graphics/shader.cc

@@ -32 +32 @@
 #endif
 
-using namespace std;
+