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

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/FPSTest.oxw (modified) (1 prop)
• levels/Spacerace2.oxw (modified) (1 prop)
• levels/asteroidField.oxw (modified) (1 prop)
• levels/asteroids.oxw (modified) (1 prop)
• levels/docking.oxw (modified) (1 prop)
• levels/dynamicMatch.oxw (modified) (1 prop)
• levels/earth.oxw (modified) (1 prop)
• levels/emptyLevel.oxw (modified) (1 prop)
• levels/events.oxw (modified) (1 prop)
• levels/fightInOurBack.oxw (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)
• levels/lastManStanding.oxw (modified) (1 prop)
• levels/lastTeamStanding.oxw (modified) (1 prop)
• levels/lastTeamStandingII.oxw (modified) (1 prop)
• levels/missionOne.oxw (modified) (1 prop)
• levels/myTestLevel.oxw (modified) (1 prop)
• levels/notifications.oxw (modified) (1 prop)
• levels/old (modified) (1 prop)
• levels/pickups.oxw (modified) (1 prop)
• levels/pirateAttack.oxw (modified) (1 prop)
• levels/planets.oxw (modified) (1 prop)
• levels/pong.oxw (modified) (1 prop)
• levels/portals.oxw (modified) (1 prop)
• levels/presentation.oxw (modified) (1 prop)
• levels/presentation09.oxw (modified) (1 prop)
• levels/presentation09b.oxw (modified) (1 prop)
• levels/presentationDM.oxw (modified) (1 prop)
• levels/presentationFS10.oxw (modified) (1 prop)
• levels/presentationFS102.oxw (modified) (1 prop)
• levels/presentationFS10Ed.oxw (modified) (1 prop)
• levels/presentationFS11.oxw (modified) (1 prop)
• levels/presentationHS09.oxw (modified) (1 prop)
• levels/presentationHS09b.oxw (modified) (1 prop)
• levels/presentationHS11.oxw (modified) (1 prop)
• levels/princessAeryn.oxw (modified) (1 prop)
• levels/quests.oxw (modified) (1 prop)
• levels/screenshot.oxw (modified) (1 prop)
• levels/shieldTest.oxw (modified) (1 prop)
• levels/sound.oxw (modified) (1 prop)
• levels/spaceRace.oxw (modified) (1 prop)
• levels/surfaceRace.oxw (modified) (1 prop)
• levels/teamBaseMatch.oxw (modified) (1 prop)
• levels/teamDeathMatch.oxw (modified) (1 prop)
• levels/templates (modified) (1 prop)
• levels/templates/FPS.oxt (modified) (1 prop)
• levels/templates/lodInformation.oxt (modified) (1 prop)
• levels/templates/pickupRepresentationTemplates.oxt (modified) (1 prop)
• levels/templates/spaceshipAssff.oxt (modified) (1 prop)
• levels/templates/spaceshipAssff2.oxt (modified) (1 prop)
• levels/templates/spaceshipGhost.oxt (modified) (1 prop)
• levels/templates/spaceshipH2.oxt (modified) (1 prop)
• levels/templates/spaceshipHXY.oxt (modified) (1 prop)
• levels/templates/spaceshipHXYSL.oxt (modified) (1 prop)
• levels/templates/spaceshipPirate.oxt (modified) (1 prop)
• levels/templates/spaceshipRace.oxt (modified) (1 prop)
• levels/templates/spaceshipSpacecruiser.oxt (modified) (1 prop)
• levels/templates/spaceshipSwallow.oxt (modified) (1 prop)
• levels/templates/spaceshipTransporter.oxt (modified) (1 prop)
• levels/templates/spaceshipTransporterSL.oxt (modified) (1 prop)
• levels/testStars.oxw (modified) (1 prop)
• levels/testSwallow.oxw (modified) (1 prop)
• levels/tetris.oxw (modified) (1 prop)
• levels/theTimeMachine.oxw (modified) (1 prop)
• levels/tutorial.oxw (modified) (1 prop)
• levels/underAttack.oxw (modified) (1 prop)
• levels/waypoints.oxw (modified) (1 prop)