Changeset 9243 for code/branches

Timestamp:

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

Author:

landauf

Message:

removed accidental svn:mergeinfo from r9241

Location:

code/branches/presentation2012

Files:

• CMakeLists.txt (modified) (1 prop)
• INSTALL (modified) (1 prop)
• LICENSE (modified) (1 prop)
• README (modified) (1 prop)
• bin (modified) (1 prop)
• cmake (modified) (1 prop)
• contrib (modified) (1 prop)
• data (modified) (1 prop)
• data/levels (modified) (1 prop)
• data/levels/FPSTest.oxw (modified) (1 prop)
• data/levels/Spacerace2.oxw (modified) (1 prop)
• data/levels/asteroidField.oxw (modified) (1 prop)
• data/levels/asteroids.oxw (modified) (1 prop)
• data/levels/docking.oxw (modified) (1 prop)
• data/levels/dynamicMatch.oxw (modified) (1 prop)
• data/levels/earth.oxw (modified) (1 prop)
• data/levels/emptyLevel.oxw (modified) (1 prop)
• data/levels/events.oxw (modified) (1 prop)
• data/levels/fightInOurBack.oxw (modified) (1 prop)
• data/levels/includes (modified) (1 prop)
• data/levels/includes/CuboidSpaceStation.lua (modified) (1 prop)
• data/levels/includes/asteroidField.lua (modified) (1 prop)
• data/levels/includes/notifications.oxi (modified) (1 prop)
• data/levels/includes/pickups.oxi (modified) (1 prop)
• data/levels/includes/weaponSettingsAssff.oxi (modified) (1 prop)
• data/levels/includes/weaponSettingsAssff2.oxi (modified) (1 prop)
• data/levels/includes/weaponSettingsFPS.oxi (modified) (1 prop)
• data/levels/includes/weaponSettingsGhost.oxi (modified) (1 prop)
• data/levels/includes/weaponSettingsH2.oxi (modified) (1 prop)
• data/levels/includes/weaponSettingsHXY.oxi (modified) (1 prop)
• data/levels/includes/weaponSettingsImmTest.oxi (modified) (1 prop)
• data/levels/includes/weaponSettingsPirate.oxi (modified) (1 prop)
• data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) (1 prop)
• data/levels/includes/weaponSettingsSwallow.oxi (modified) (1 prop)
• data/levels/includes/weaponSettingsTransporter.oxi (modified) (1 prop)
• data/levels/lastManStanding.oxw (modified) (1 prop)
• data/levels/lastTeamStanding.oxw (modified) (1 prop)
• data/levels/lastTeamStandingII.oxw (modified) (1 prop)
• data/levels/missionOne.oxw (modified) (1 prop)
• data/levels/myTestLevel.oxw (modified) (1 prop)
• data/levels/notifications.oxw (modified) (1 prop)
• data/levels/old (modified) (1 prop)
• data/levels/pickups.oxw (modified) (1 prop)
• data/levels/pirateAttack.oxw (modified) (1 prop)
• data/levels/planets.oxw (modified) (1 prop)
• data/levels/pong.oxw (modified) (1 prop)
• data/levels/portals.oxw (modified) (1 prop)
• data/levels/presentation.oxw (modified) (1 prop)
• data/levels/presentation09.oxw (modified) (1 prop)
• data/levels/presentation09b.oxw (modified) (1 prop)
• data/levels/presentationDM.oxw (modified) (1 prop)
• data/levels/presentationFS10.oxw (modified) (1 prop)
• data/levels/presentationFS102.oxw (modified) (1 prop)
• data/levels/presentationFS10Ed.oxw (modified) (1 prop)
• data/levels/presentationFS11.oxw (modified) (1 prop)
• data/levels/presentationHS09.oxw (modified) (1 prop)
• data/levels/presentationHS09b.oxw (modified) (1 prop)
• data/levels/presentationHS11.oxw (modified) (1 prop)
• data/levels/princessAeryn.oxw (modified) (1 prop)
• data/levels/quests.oxw (modified) (1 prop)
• data/levels/screenshot.oxw (modified) (1 prop)
• data/levels/shieldTest.oxw (modified) (1 prop)
• data/levels/sound.oxw (modified) (1 prop)
• data/levels/spaceRace.oxw (modified) (1 prop)
• data/levels/surfaceRace.oxw (modified) (1 prop)
• data/levels/teamBaseMatch.oxw (modified) (1 prop)
• data/levels/teamDeathMatch.oxw (modified) (1 prop)
• data/levels/templates (modified) (1 prop)
• data/levels/templates/FPS.oxt (modified) (1 prop)
• data/levels/templates/lodInformation.oxt (modified) (1 prop)
• data/levels/templates/pickupRepresentationTemplates.oxt (modified) (1 prop)
• data/levels/templates/spaceshipAssff.oxt (modified) (1 prop)
• data/levels/templates/spaceshipAssff2.oxt (modified) (1 prop)
• data/levels/templates/spaceshipGhost.oxt (modified) (1 prop)
• data/levels/templates/spaceshipH2.oxt (modified) (1 prop)
• data/levels/templates/spaceshipHXY.oxt (modified) (1 prop)
• data/levels/templates/spaceshipHXYSL.oxt (modified) (1 prop)
• data/levels/templates/spaceshipPirate.oxt (modified) (1 prop)
• data/levels/templates/spaceshipRace.oxt (modified) (1 prop)
• data/levels/templates/spaceshipSpacecruiser.oxt (modified) (1 prop)
• data/levels/templates/spaceshipSwallow.oxt (modified) (1 prop)
• data/levels/templates/spaceshipTransporter.oxt (modified) (1 prop)
• data/levels/templates/spaceshipTransporterSL.oxt (modified) (1 prop)
• data/levels/testStars.oxw (modified) (1 prop)
• data/levels/testSwallow.oxw (modified) (1 prop)
• data/levels/tetris.oxw (modified) (1 prop)
• data/levels/theTimeMachine.oxw (modified) (1 prop)
• data/levels/tutorial.oxw (modified) (1 prop)
• data/levels/underAttack.oxw (modified) (1 prop)
• data/levels/waypoints.oxw (modified) (1 prop)
• data/overlays (modified) (1 prop)
• data/overlays/HUD.oxo (modified) (1 prop)
• data/overlays/HUDTemplates3.oxo (modified) (1 prop)
• data/overlays/HUDTemplatesFPS.oxo (modified) (1 prop)
• data/overlays/debug.oxo (modified) (1 prop)
• data/overlays/dynamicMatchHUD.oxo (modified) (1 prop)
• data/overlays/lastManStandingHUD.oxo (modified) (1 prop)
• data/overlays/lastTeamStandingHUD.oxo (modified) (1 prop)
• data/overlays/pongHUD.oxo (modified) (1 prop)
• data/overlays/stats.oxo (modified) (1 prop)
• data/overlays/teamBaseMatchHUD.oxo (modified) (1 prop)
• data/overlays/underAttackHUD.oxo (modified) (1 prop)
• doc (modified) (1 prop)
• src (modified) (1 prop)
• src/modules (modified) (1 prop)
• src/modules/CMakeLists.txt (modified) (1 prop)
• src/modules/designtools (modified) (1 prop)
• src/modules/docking (modified) (1 prop)
• src/modules/gametypes (modified) (1 prop)
• src/modules/notifications (modified) (1 prop)
• src/modules/objects (modified) (1 prop)
• src/modules/overlays (modified) (1 prop)
• src/modules/pickup (modified) (1 prop)
• src/modules/pong (modified) (1 prop)
• src/modules/portals (modified) (1 prop)
• src/modules/questsystem (modified) (1 prop)
• src/modules/tetris (modified) (1 prop)
• src/modules/weapons (modified) (1 prop)