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

Merge remote-tracking branch 'origin/3.2'

Browse Source 
Conflicts:
	src/plugins/git/changeselectiondialog.cpp
	src/plugins/git/changeselectiondialog.h
	src/plugins/git/gerrit/gerritplugin.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/git/gitclient.h
	src/plugins/git/gitsettings.cpp
	src/plugins/git/gitsettings.h
	src/plugins/git/mergetool.cpp

Change-Id: Icd1b2741da96395ed1b41903f453049a303e4791
This commit is contained in:
Eike Ziller
2014-07-18 14:04:51 +02:00
parent 292cf6c9e8 7dfb7df471
commit c571ecbd51
75 changed files with 801 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,7 +136,7 @@ public:
explicit GitClient(GitSettings *settings);
~GitClient();
Utils::FileName gitBinaryPath(bool *ok = 0, QString *errorMessage = 0) const;
Utils::FileName gitExecutable(bool *ok = 0, QString *errorMessage = 0) const;
unsigned gitVersion(QString *errorMessage = 0) const;
QString findRepositoryForDirectory(const QString &dir);