Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6424 in orxonox.OLD for trunk/src/orxonox.cc


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

orxonox/trunk: merged the branche network back to the trunk
merged with command:
svn merge https://svn.orxonox.net/orxonox/branches/network . -r 6351:HEAD
no conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/orxonox.cc

    r6142 r6424  
    409409    else if(!strcmp( "--server", argv[i])   || !strcmp("-s", argv[i]))
    410410      return startNetworkOrxonox(argc, argv);
    411     else if(!strcmp( "--license", argv[i])  || !strcmp("-s", argv[i]))
     411    else if(!strcmp( "--license", argv[i])  || !strcmp("-l", argv[i]))
    412412      return PRINT(0)(ORXONOX_LICENSE_SHORT);
    413413  }
Note: See TracChangeset for help on using the changeset viewer.