Merge from trunk

[SVN r61962]
This commit is contained in:
Vladimir Prus
2010-05-14 06:55:15 +00:00
parent ab9901f553
commit cbacc90d8f
6 changed files with 32 additions and 13 deletions

View File

@@ -79,7 +79,7 @@ int main(int ac, char* av[])
ifstream ifs(config_file.c_str());
if (!ifs)
{
cout << "can not open config file: " << config_file << "\n";
cout << "can not open config file: " << config_file << "\n";
return 0;
}
else