Changeset 2088 for code/trunk
- Timestamp:
- Nov 1, 2008, 7:16:27 PM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 28 edited
- 7 copied
-
. (modified) (1 prop)
-
src/core/XMLIncludes.h (modified) (1 prop)
-
src/orxonox/objects/infos/Level.cc (modified) (1 prop)
-
src/orxonox/objects/infos/Level.h (modified) (1 prop)
-
src/orxonox/objects/pickup (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup)
-
src/orxonox/objects/pickup/ShipEquipment.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/ShipEquipment.h)
-
src/orxonox/objects/pickup/ShipEquipmentClasses.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/ShipEquipmentClasses.cc)
-
src/orxonox/objects/pickup/ShipEquipmentClasses.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/ShipEquipmentClasses.h)
-
src/orxonox/objects/pickup/ShipItem.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/ShipItem.cc)
-
src/orxonox/objects/pickup/ShipItem.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/ShipItem.h)
-
src/orxonox/objects/pickup/Usable.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/Usable.h)
-
src/tolua/tolua-5.1.pkg (modified) (1 prop)
-
src/util (modified) (1 prop)
-
src/util/Exception.cc (modified) (1 prop)
-
src/util/Exception.h (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/directories.vsprops (modified) (1 prop)
-
visual_studio/vc8/lua.vsprops (modified) (1 prop)
-
visual_studio/vc8/network.vsprops (modified) (1 prop)
-
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/trunk ¶
- Property svn:mergeinfo changed
/code/branches/pickups (added) merged: 1927,1997-1998,2000,2055,2083
- Property svn:mergeinfo changed
-
code/trunk/src/core/XMLIncludes.h ¶
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/src/orxonox/objects/infos/Level.cc ¶
- Property svn:mergeinfo changed
/code/trunk/src/orxonox/objects/infos/Level.cc (added) merged: 2-1925
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/infos/Level.h ¶
- Property svn:mergeinfo changed
/code/trunk/src/orxonox/objects/infos/Level.h (added) merged: 2-1925
- Property svn:mergeinfo changed
-
code/trunk/src/tolua/tolua-5.1.pkg ¶
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/src/util ¶
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/src/util/Exception.cc ¶
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/trunk/src/util/Exception.h ¶
- Property svn:mergeinfo changed (with no actual effect on merging)
-
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 (with no actual effect on merging)
-
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.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.vsprops ¶
- Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset
for help on using the changeset viewer.
