feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.4'

Browse Source
This commit is contained in:
Eike Ziller
2015-03-19 16:00:28 +01:00
parent 318e1ca422 bc6893773f
commit aee54f9df5
94 changed files with 661 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/diffeditor/diffeditor.cpp
View File

@@ -326,7 +326,7 @@ QWidget *DiffEditor::toolBar()
m_contextLabel = new QLabel(m_toolBar);
m_contextLabel->setText(tr("Context Lines:"));
m_contextLabel->setText(tr("Context lines:"));
m_contextLabel->setContentsMargins(6, 0, 6, 0);
m_toolBar->addWidget(m_contextLabel);