Context Navigation

← Previous Change
Next Change →

emptyLevel.oxw

Timestamp:

Jan 9, 2016, 6:26:20 PM (10 years ago)

Author:

landauf

Message:

merged branch presentationHS15 back to trunk

Location:

code/trunk

Files:

: 2 edited

. (modified) (1 prop)
data/levels/emptyLevel.oxw (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

code/trunk

Property svn:mergeinfo changed

/code/branches/AI_HS15 (added)	merged: 10640,10651-10652,10654-10655,10670,10673,10678-10679,10681-10682,10709,10717-10719,10722,10725,10729,10731,10737,10759,10761-10764,10780,10782,10789,10793,10796-10800,10803,10805,10826-10827,10832
/code/branches/campaignHS15 (added)	merged: 10639,10642,10645,10649,10663,10666-10667,10674,10676,10680,10683-10684,10689-10690,10695-10696,10699,10703,10705,10710-10711,10730,10735,10740-10741,10743,10748-10750,10754,10758,10766-10767,10779,10783,10792,10802,10804,10808-10809,10812,10823-10824,10834,10838-10841,10843-10844,10847-10851,10854-10856,10858-10859,10861,10863-10864,10866-10875,10877,10879-10883,10885-10888,10890-10892,10896,10898,10903-10904,10906-10907,10909-10910,10912-10915,10921,10923-10925,10927,10932,10934-10935,10946,10950,10953-10958,10968-10969,10971
/code/branches/explosionChunksHS15 (added)	merged: 10641,10669,10752-10753,10755,10786,10807,10810,10837,10937,10939,10942
/code/branches/fabienHS15 (added)	merged: 10685,10688,10692,10713-10715,10721,10724,10739,10746,10791,10794-10795,10814,10842,10878,11027,11033
/code/branches/hoverHS15 (added)	merged: 10633-10636,10638,10643,10656-10662,10664-10665,10668,10694,10697,10700,10708,10751,10760,10784-10785,10787,10835,10893-10895,10900,10926,10928-10930,10938,10940,10943,10947,10952
/code/branches/particleEffectsHS15 (added)	merged: 10644,10671,10706,10836,10889,10897,10901,10908,10911,10944,10948
/code/branches/planetLevelHS15 (added)	merged: 10637,10646-10647,10672,10698,10701-10702,10704,10707,10756,10788,10806,10811,10833,10860,10905,10951,10965
/code/branches/presentationHS15 (added)	merged: 10959-10963,10967,10970,10974,11025-11026,11028-11032,11034-11036,11039-11051

code/trunk/data/levels/emptyLevel.oxw

-                      r10629
+                      r11052
 <?lua
-  include("templates/spaceshipAssff2.oxt")
-  include("templates/spaceshipPirate.oxt")
   include("templates/spaceshipEscort.oxt")
-  include("templates/spaceshipRing.oxt")
-  include("templates/spaceshipSwallow.oxt")
 ?>

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 11052 for code/trunk/data/levels/emptyLevel.oxw

Legend:

code/trunk

code/trunk/data/levels/emptyLevel.oxw

Download in other formats: