Merge latest changes for stable branch (mostly unicode fixes)

This commit is contained in:
Christophe Dumez
2010-06-06 13:58:43 +00:00
parent 4805690dbe
commit c9ece4695e
6 changed files with 47 additions and 28 deletions

View File

@@ -76,7 +76,6 @@ public:
static inline sha1_hash QStringToSha1(const QString& s) {
std::string str(s.toLocal8Bit().data());
std::istringstream i(str);
std::cout << "lol" << std::endl;
sha1_hash x;
i>>x;
return x;