diff options
| author | Sky <git@bunnies.cc> | 2014-01-02 19:49:12 +0000 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2014-01-02 19:49:12 +0000 |
| commit | f08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f (patch) | |
| tree | 6ccc6671f06312a54d14bfc5c78dea95f721857c /gui | |
| parent | 47d577b7669e2ff7ea331f75e33911ddf7bffd05 (diff) | |
| parent | aa5f2c8120cc23de0d57c9f0280512adb9a531b3 (diff) | |
| download | MultiMC-f08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f.tar MultiMC-f08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f.tar.gz MultiMC-f08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f.tar.lz MultiMC-f08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f.tar.xz MultiMC-f08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/dialogs/IconPickerDialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gui/dialogs/IconPickerDialog.cpp b/gui/dialogs/IconPickerDialog.cpp index cb832d95..f7970b37 100644 --- a/gui/dialogs/IconPickerDialog.cpp +++ b/gui/dialogs/IconPickerDialog.cpp @@ -103,7 +103,7 @@ void IconPickerDialog::addNewIcon() QString selectIcons = tr("Select Icons"); //: The type of icon files QStringList fileNames = QFileDialog::getOpenFileNames(this, selectIcons, QString(), - tr("Icons") + "(*.png *.jpg *.jpeg)"); + tr("Icons") + "(*.png *.jpg *.jpeg *.ico)"); MMC->icons()->installIcons(fileNames); } |