Changeset 4194 in orxonox.OLD for orxonox/branches/openAL/src/story_entities/campaign.h

Timestamp:

May 16, 2005, 1:33:19 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/openAL: merged trunk back to openAL
merged with command:

svn merge ../trunk/ openAL/ -r 3920:HEAD

no conflicts at all

Location:

orxonox/branches/openAL

Files:

• . (modified) (1 prop)
• src/story_entities/campaign.h (modified) (1 diff)

orxonox/branches/openAL

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

orxonox/branches/openAL/src/story_entities/campaign.h

@@ -14 +14 @@
  public:
   Campaign ();
+  Campaign ( TiXmlElement* root);
   virtual ~Campaign ();
 

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+