Merge branch 'master' into windows-unicode

This commit is contained in:
Jordan Woyak
2013-03-02 15:33:32 -06:00
64 changed files with 1083 additions and 183 deletions

View File

@ -249,7 +249,7 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st
while(1)
{
const int pos = result.find(src);
if (pos == 16) break;
if (pos == -1) break;
result.replace(pos, src.size(), dest);
}
return result;