Changeset 2171 for code/trunk/visual_studio
- Timestamp:
- Nov 10, 2008, 12:05:03 AM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/objecthierarchy merged: 2111-2115,2123,2132-2134,2143-2144,2153-2158,2160-2169
- Property svn:mergeinfo changed
-
code/trunk/visual_studio/vc8/audio.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/visual_studio/vc8/base.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/visual_studio/vc8/ceguilua.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/visual_studio/vc8/core.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/visual_studio/vc8/cpptcl.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/visual_studio/vc8/debug.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/visual_studio/vc8/directories.vsprops
- Property svn:mergeinfo changed
/code/branches/objecthierarchy/visual_studio/vc8/directories.vsprops merged: 2114-2115
- Property svn:mergeinfo changed
-
code/trunk/visual_studio/vc8/lua.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/visual_studio/vc8/network.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/visual_studio/vc8/orxonox.vcproj
r2107 r2171 167 167 </File> 168 168 <File 169 RelativePath="..\..\src\orxonox\PlayerManager.cc" 170 > 171 </File> 172 <File 169 173 RelativePath="..\..\src\orxonox\PrecompiledHeaderFiles.cc" 170 174 > … … 206 210 </File> 207 211 <File 212 RelativePath="..\..\src\orxonox\objects\Level.cc" 213 > 214 </File> 215 <File 208 216 RelativePath="..\..\src\orxonox\objects\Radar.cc" 209 217 > … … 358 366 <File 359 367 RelativePath="..\..\src\orxonox\objects\infos\Info.cc" 360 >361 </File>362 <File363 RelativePath="..\..\src\orxonox\objects\infos\Level.cc"364 368 > 365 369 </File> … … 827 831 </File> 828 832 <File 833 RelativePath="..\..\src\orxonox\PlayerManager.h" 834 > 835 </File> 836 <File 829 837 RelativePath="..\..\src\orxonox\Settings.h" 830 838 > … … 846 854 </File> 847 855 <File 856 RelativePath="..\..\src\orxonox\objects\Level.h" 857 > 858 </File> 859 <File 848 860 RelativePath="..\..\src\orxonox\objects\Radar.h" 849 861 > … … 978 990 <File 979 991 RelativePath="..\..\src\orxonox\objects\infos\Info.h" 980 >981 </File>982 <File983 RelativePath="..\..\src\orxonox\objects\infos\Level.h"984 992 > 985 993 </File> -
code/trunk/visual_studio/vc8/orxonox.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/visual_studio/vc8/orxonox_vc8.sln
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/visual_studio/vc8/release.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/visual_studio/vc8/tinyxml.vcproj
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/visual_studio/vc8/tinyxml.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/visual_studio/vc8/tolua.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/visual_studio/vc8/toluagen.vcproj
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/visual_studio/vc8/toluagen.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/visual_studio/vc8/toluagen_orxonox.vcproj
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/visual_studio/vc8/toluagen_orxonox.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/visual_studio/vc8/util.vcproj
r2087 r2171 235 235 </File> 236 236 <File 237 RelativePath="..\..\src\util\mbool.h" 238 > 239 </File> 240 <File 237 241 RelativePath="..\..\src\util\MultiType.h" 238 242 > -
code/trunk/visual_studio/vc8/util.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset
for help on using the changeset viewer.