Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 19, 2005, 7:45:28 PM (19 years ago)
Author:
bensch
Message:

orxonox/branches/physics: merged back the Trunk into the Physics-branche
merged with command:
svn merge -r 4178:HEAD ../trunk/ physics
no conflicts in relevant files

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orxonox/branches/physics/src/util/resource_manager.cc

    r4178 r4223  
    648648char* ResourceManager::getFullName(const char* fileName)
    649649{
    650   char* retName = new char[strlen(ResourceManager::getInstance()->getDataDir()) + strlen(fileName)+1];
     650  char* retName = new char[strlen(ResourceManager::getInstance()->getDataDir())
     651                           + strlen(fileName) + 1];
    651652  sprintf(retName, "%s%s", ResourceManager::getInstance()->getDataDir(), fileName);
    652653  if (ResourceManager::isFile(retName))
Note: See TracChangeset for help on using the changeset viewer.