Changeset 9298 in orxonox.OLD for trunk/src/lib/script_engine/script.h

Timestamp:

Jul 17, 2006, 9:29:22 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the branche scripting back here.

merged with command:
svn merge -r9239:HEAD ​https://svn.orxonox.net/orxonox/branches/scripting .
no conflicts

File:

• trunk/src/lib/script_engine/script.h (modified) (1 diff)

trunk/src/lib/script_engine/script.h

@@ -24 +24 @@
   public:
     Script(const TiXmlElement* root = NULL);
+    Script(const std::string& filename);
     ~Script();