diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-10-22 08:40:59 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-10-22 08:40:59 +0200 |
| commit | 4eabcdc8fdd226eb9195b7ca3a303e052c90277c (patch) | |
| tree | f3d4970c9b285a764d54b012aab6e7307a0fe93b /src/plugins/git/logchangedialog.h | |
| parent | b8c3a79705c6504b1aeb20476794c4f1b537ec01 (diff) | |
| parent | 10f42df8b3532ae71fd7d405e28614f81bcf40e7 (diff) | |
| download | qt-creator-4eabcdc8fdd226eb9195b7ca3a303e052c90277c.tar.gz | |
Merge remote-tracking branch 'origin/3.0'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/git/gitplugin.cpp
src/plugins/qt4projectmanager/qmakeproject.cpp
Change-Id: Icbd485214b1add7869233dfe0dd9c6a76bddfc7d
Diffstat (limited to 'src/plugins/git/logchangedialog.h')
| -rw-r--r-- | src/plugins/git/logchangedialog.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/git/logchangedialog.h b/src/plugins/git/logchangedialog.h index f7f099920e..f95604d84c 100644 --- a/src/plugins/git/logchangedialog.h +++ b/src/plugins/git/logchangedialog.h @@ -80,7 +80,7 @@ class LogChangeDialog : public QDialog { Q_OBJECT public: - LogChangeDialog(bool isReset, QWidget *parent = 0); + LogChangeDialog(bool isReset, QWidget *parent); bool runDialog(const QString &repository, const QString &commit = QString(), bool includeRemote = true); |