Changeset 3430 in orxonox.OLD for orxonox/branches/trackManager/src/sfont

Timestamp:

Mar 1, 2005, 9:50:30 AM (20 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:

• . (modified) (1 prop)
• src/sfont (copied) (copied from orxonox/trunk/src/sfont)
• src/sfont/font.cc (copied) (copied from orxonox/trunk/src/sfont/font.cc)
• src/sfont/sfont.c (copied) (copied from orxonox/trunk/src/sfont/sfont.c)
• src/sfont/sfont.h (copied) (copied from orxonox/trunk/src/sfont/sfont.h)