Changeset 2492 for code/branches/presentation/visual_studio

Timestamp:

Dec 17, 2008, 12:55:03 AM (16 years ago)

Author:

rgrieder

Message:

Merged overlay branch into presentation branch.

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• visual_studio/vc8/audio.vsprops (modified) (1 prop)
• visual_studio/vc8/base.vsprops (modified) (1 prop)
• visual_studio/vc8/ceguilua.vsprops (modified) (1 prop)
• visual_studio/vc8/core.vsprops (modified) (1 prop)
• visual_studio/vc8/cpptcl.vsprops (modified) (1 prop)
• visual_studio/vc8/debug.vsprops (modified) (1 prop)
• visual_studio/vc8/lua.vsprops (modified) (1 prop)
• visual_studio/vc8/network.vsprops (modified) (1 prop)
• visual_studio/vc8/orxonox.vcproj (modified) (2 diffs)
• visual_studio/vc8/orxonox.vsprops (modified) (1 prop)
• visual_studio/vc8/orxonox_vc8.sln (modified) (1 prop)
• visual_studio/vc8/release.vsprops (modified) (1 prop)
• visual_studio/vc8/tinyxml.vcproj (modified) (1 prop)
• visual_studio/vc8/tinyxml.vsprops (modified) (1 prop)
• visual_studio/vc8/tolua.vsprops (modified) (1 prop)
• visual_studio/vc8/toluagen.vcproj (modified) (1 prop)
• visual_studio/vc8/toluagen.vsprops (modified) (1 prop)
• visual_studio/vc8/toluagen_orxonox.vcproj (modified) (1 prop)
• visual_studio/vc8/toluagen_orxonox.vsprops (modified) (1 prop)
• visual_studio/vc8/util.vsprops (modified) (1 prop)

code/branches/presentation/visual_studio/vc8/orxonox.vcproj

@@ -840 +840 @@
                                 </Filter>
                                 <Filter
+                                        Name="stats"
+                                        >
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\stats\Stats.cc"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\stats\StatsTest.cc"
+                                                >
+                                        </File>
+                                </Filter>
+                                <Filter
                                         Name="notifications"
                                         >
@@ -1458 +1470 @@
                                         <File
                                                 RelativePath="..\..\src\orxonox\overlays\debug\DebugRTRText.h"
+                                                >
+                                        </File>
+                                </Filter>
+                                <Filter
+                                        Name="stats"
+                                        >
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\stats\Stats.h"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\stats\StatsTest.h"
                                                 >
                                         </File>