Changeset 8194 for code/branches/dockingsystem/data/overlays

Timestamp:

Apr 6, 2011, 12:07:29 PM (14 years ago)

Author:

dafrick

Message:

Merging trunk into dockingsystem branch to be able to use the recent bugfix in MultiTrigger.

Location:

code/branches/dockingsystem

Files:

• . (modified) (1 prop)
• data/overlays/lastManStandingHUD.oxo (modified) (2 diffs)
• data/overlays/lastTeamStandingHUD.oxo (copied) (copied from code/trunk/data/overlays/lastTeamStandingHUD.oxo)

code/branches/dockingsystem/data/overlays/lastManStandingHUD.oxo

@@ -65 +65 @@
     />
 
-    <OverlayText
+    <!--OverlayText
      position  = "0.02, 0.07"
      pickpoint = "0.0, 0.0"
@@ -93 +93 @@
      align     = "left"
      caption   = "|"
-    />
+    /-->
 
   </OverlayGroup>