Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6222 in orxonox.OLD for trunk/src/Makefile.am


Ignore:
Timestamp:
Dec 21, 2005, 1:49:06 PM (18 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/Makefile.am

    r6139 r6222  
    8686                  world_entities/space_ships/space_ship.cc \
    8787                  world_entities/space_ships/helicopter.cc \
     88                  world_entities/creatures/md2_creature.cc \
    8889                  world_entities/spawning_point.cc \
    8990                  subprojects/benchmark.cc
    … …  
    133134                 world_entities/space_ships/space_ship.h \
    134135                 world_entities/space_ships/helicopter.h \
     136                 world_entities/creatures/md2_creature.h \
    135137                 world_entities/spawning_point.h \
    136138                 defs/stdincl.h \
Note: See TracChangeset for help on using the changeset viewer.