Changeset 9243 for code/branches/presentation2012/data/levels/includes

Timestamp:

May 24, 2012, 9:33:31 PM (13 years ago)

Author:

landauf

Message:

removed accidental svn:mergeinfo from r9241

Location:

code/branches/presentation2012/data

Files:

• . (modified) (1 prop)
• levels (modified) (1 prop)
• levels/includes (modified) (1 prop)
• levels/includes/CuboidSpaceStation.lua (modified) (1 prop)
• levels/includes/asteroidField.lua (modified) (1 prop)
• levels/includes/notifications.oxi (modified) (1 prop)
• levels/includes/pickups.oxi (modified) (1 prop)
• levels/includes/weaponSettingsAssff.oxi (modified) (1 prop)
• levels/includes/weaponSettingsAssff2.oxi (modified) (1 prop)
• levels/includes/weaponSettingsFPS.oxi (modified) (1 prop)
• levels/includes/weaponSettingsGhost.oxi (modified) (1 prop)
• levels/includes/weaponSettingsH2.oxi (modified) (1 prop)
• levels/includes/weaponSettingsHXY.oxi (modified) (1 prop)
• levels/includes/weaponSettingsImmTest.oxi (modified) (1 prop)
• levels/includes/weaponSettingsPirate.oxi (modified) (1 prop)
• levels/includes/weaponSettingsSpacecruiser.oxi (modified) (1 prop)
• levels/includes/weaponSettingsSwallow.oxi (modified) (1 prop)
• levels/includes/weaponSettingsTransporter.oxi (modified) (1 prop)