jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 00:54:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'upstream/master' into no-overwrite-tokens-xml

Browse source 
Conflicts:
	cockatrice/src/carddatabase.cpp
This commit is contained in:
Waleed Khan 2014-08-07 11:06:41 -04:00
commit c0d4669088
25 changed files with 135 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
oracle/src/oraclewizard.cpp
View file

@ -383,7 +383,7 @@ void SaveSetsPage::initializePage()
QMessageBox::critical(this, tr("Error"), tr("No set has been imported."));
}
void SaveSetsPage::updateTotalProgress(int cardsImported, int setIndex, const QString &setName)
void SaveSetsPage::updateTotalProgress(int cardsImported, int /* setIndex */, const QString &setName)
{
if (setName.isEmpty()) {
messageLog->append("<b>" + tr("Import finished: %1 cards.").arg(wizard()->importer->getCardList().size()) + "</b>");