Merge branch 'master' into jo-remove-name-filters-from-settings

This commit is contained in:
Jeffrey Oliver 2015-01-28 20:28:36 -08:00
commit 763d8a7919
267 changed files with 28306 additions and 10990 deletions

View file

@ -105,7 +105,7 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
case Qt::DisplayRole:
return QString::fromStdString(g.description());
case Qt::TextAlignmentRole:
Qt::AlignLeft;
return Qt::AlignLeft;
default:
return QVariant();
}