Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 1, 2005, 9:50:30 AM (19 years ago)
Author:
bensch
Message:

orxonox/branches/trackManager: merged trunk back to trackManager
merged with command
svn merge -r 3369:HEAD trunk/ branches/trackManager
resoloved conflicts in favor of the trunk.

Location:
orxonox/branches/trackManager
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/trackManager

    • Property svn:externals set to

  • orxonox/branches/trackManager/src/importer/Makefile.am

    r3369 r3430  
    99                  windowHandler.cc \
    1010                  model.cc \
     11                  objModel.cc \
    1112                  array.cc \
    1213                  material.cc \
    1314                  texture.cc \
    14                   vector.cc
     15                  ../vector.cc
    1516
    1617noinst_HEADERS= framework.h \
    1718                windowHandler.h \
    1819                model.h \
     20                objModel.h \
    1921                array.h \
    2022                material.h \
Note: See TracChangeset for help on using the changeset viewer.