Merge branch 'Plasma/5.3'

This commit is contained in:
Eike Hein 2015-06-05 18:04:02 +02:00
commit 8468da197c

View file

@ -435,7 +435,7 @@ void KTitleBarActionsConfig::save()
void KTitleBarActionsConfig::defaults() void KTitleBarActionsConfig::defaults()
{ {
setComboText(m_ui->coTiDbl, "Shade"); setComboText(m_ui->coTiDbl, "Maximize");
setComboText(m_ui->coTiAct1, "Raise"); setComboText(m_ui->coTiAct1, "Raise");
setComboText(m_ui->coTiAct2, "Start Window Tab Drag"); setComboText(m_ui->coTiAct2, "Start Window Tab Drag");
setComboText(m_ui->coTiAct3, "Operations menu"); setComboText(m_ui->coTiAct3, "Operations menu");