Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jul 24, 2006, 11:09:47 AM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/parser/ini_parser/ini_parser.cc

    r7729 r9406  
    3535#endif
    3636
    37 using namespace std;
     37
    3838
    3939/**
     
    142142      if ( (*lineBegin == '#' || *lineBegin == ';'))
    143143      {
    144         string newCommenLine = lineBegin;
     144        std::string newCommenLine = lineBegin;
    145145        this->commentList.push_back(newCommenLine);
    146146        continue;
     
    242242  }
    243243  fclose(stream);
     244  return true;
    244245}
    245246
Note: See TracChangeset for help on using the changeset viewer.