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

Merge remote-tracking branch 'origin/3.0'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/git/gitplugin.cpp
	src/plugins/qt4projectmanager/qmakeproject.cpp

Change-Id: Icbd485214b1add7869233dfe0dd9c6a76bddfc7d
This commit is contained in:
Eike Ziller
2013-10-22 08:40:59 +02:00
parent b8c3a79705 10f42df8b3
commit 4eabcdc8fd
514 changed files with 4458 additions and 3132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/logchangedialog.h
View File

@@ -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);