Changeset 2664 for code/branches/buildsystem3/src/core/Template.cc

Timestamp:

Feb 14, 2009, 10:53:45 PM (16 years ago)

Author:

rgrieder

Message:

Merged buildsystem2 to buildsystem3.

Note: Bare merge, just resolved conflicts. To testing, no nothing.

Location:

code/branches/buildsystem3

Files:

• . (modified) (2 props)
• src/core/Template.cc (modified) (1 diff, 1 prop)

code/branches/buildsystem3/src/core/Template.cc

@@ -29 +29 @@
 #include "Template.h"
 
+#include <tinyxml/ticpp.h>
+
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "util/Debug.h"
-#include "tinyxml/ticpp.h"
 
 namespace orxonox