Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6222 in orxonox.OLD for trunk/src/defs


Ignore:
Timestamp:
Dec 21, 2005, 1:49:06 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the christmas branche to the trunk
merged with command:
svn merge -r6165:HEAD christmas_branche/ ../trunk/
no conflicts

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore set to
      Makefile.in
      Makefile
      configure
      *.kdevelop
      Doxyfile
      config.log
      config.h
      config.status
      stamp-h1
      autom4te.cache
      aclocal.m4

  • trunk/src

    • Property svn:ignore set to
      .deps
      orxonox
      Makefile
      Makefile.in

  • trunk/src/defs/class_id.h

    r6162 r6222  
    149149  CL_SPACE_SHIP                 =    0x0000020a,
    150150  CL_HELICOPTER                 =    0x0000020b,
    151   CL_SPAWNING_POINT             =    0x0000020b,
     151  CL_SPAWNING_POINT             =    0x0000020c,
     152  CL_MD2_CREATURE               =    0x0000020d,
    152153
    153154  CL_TURRET_POWER_UP            =    0x00000211,
Note: See TracChangeset for help on using the changeset viewer.