Merge branch 'master' of github.com:/pokerth/pokerth

This commit is contained in:
lotodore
2012-11-26 22:33:22 +01:00
+1 -1
View File
@@ -321,7 +321,7 @@ QString ChatTools::checkForEmotes(QString msg) {
msg.replace("B-)", "<img src=\":emotes/emotes/face-cool.png\" />");
msg.replace("8-)", "<img src=\":emotes/emotes/face-cool.png\" />");
msg.replace(":'(", "<img src=\":emotes/emotes/face-crying.png\" />");
msg.replace(">:-)", "<img src=\":emotes/emotes/face-devilish.png\" />");
msg.replace("&gt;:-)", "<img src=\":emotes/emotes/face-devilish.png\" />");
msg.replace(":-[", "<img src=\":emotes/emotes/face-embarrassed.png\" />");
msg.replace(":-*", "<img src=\":emotes/emotes/face-kiss.png\" />");
msg.replace(":-))", "<img src=\":emotes/emotes/face-laugh.png\" />");