Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jan 7, 2006, 11:23:25 PM (18 years ago)
Author:
bensch
Message:

orxonox/data/trunk: merged the network data to the trunk:
merged with command

svn merge ​https://svn.orxonox.net/data/branches/network . -r159:HEAD

no conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • data/trunk/worlds/DefaultNetworkCampaign.oxc

    r3497 r3538  
    44  <description>The one and only default debug campaign</description>
    55  <WorldList>
    6     <NetworkWorld>
     6    <MultiPlayerWorld>
    77      <identifier>0</identifier>
    88      <nextid>1</nextid>
    99      <path>worlds/Straight.oxw</path>
    10     </NetworkWorld>
    11     <NetworkWorld>
     10    </MultiPlayerWorld>
     11    <MultiPlayerWorld>
    1212      <identifier>1</identifier>
    1313      <nextid>2</nextid>
    1414      <path>worlds/DefaultWorld.oxw</path>
    15     </NetworkWorld>
     15    </MultiPlayerWorld>
    1616  </WorldList>
    1717</Campaign>
Note: See TracChangeset for help on using the changeset viewer.