Merge branch 'master' into devel

This commit is contained in:
Max-Wilhelm Bruker 2012-03-23 12:18:16 +01:00
commit 10d958c4ce
4 changed files with 11 additions and 2 deletions

View file

@ -92,7 +92,8 @@ CardInfo *OracleImporter::addCard(const QString &setName,
if (cardName.contains("XX"))
cardName.remove("XX");
cardName = cardName.replace("Æ", "AE");
cardName = cardName.replace("", "'");
CardInfo *card;
if (cardHash.contains(cardName)) {
card = cardHash.value(cardName);