Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3365 in orxonox.OLD for orxonox/trunk/src/importer/Makefile.am


Ignore:
Timestamp:
Jan 7, 2005, 1:14:33 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged branches/parenting back to the.
merged with command:
svn merge branches/parenting trunk -r 3247:HEAD
resolved all conflicts in favor of parenting.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/importer/Makefile.am

    r3201 r3365  
    88importer_SOURCES= framework.cc \
    99                  windowHandler.cc \
    10                   object.cc \
     10                  model.cc \
    1111                  array.cc \
    1212                  material.cc \
     13                  texture.cc \
    1314                  vector.cc
    1415
    1516noinst_HEADERS= framework.h \
    1617                windowHandler.h \
    17                 object.h \
     18                model.h \
    1819                array.h \
    19                 material.h
     20                material.h \
     21                texture.h
    2022
    2123
Note: See TracChangeset for help on using the changeset viewer.