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

Merge remote-tracking branch 'origin/3.6'

Browse Source 
Conflicts:
    src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp
    src/plugins/git/gitplugin.cpp

Change-Id: I78a21510d484b655e01141a3543e08ee2123f9cd
This commit is contained in:
Eike Ziller
2015-11-23 14:25:38 +01:00
parent 22e3a7b3a4 499589096a
commit 3f63635053
132 changed files with 6287 additions and 2315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/mercurial/mercurialclient.h
View File

@@ -75,6 +75,8 @@ public:
const QStringList &extraOptions = QStringList());
void revertAll(const QString &workingDir, const QString &revision = QString(),
const QStringList &extraOptions = QStringList());
public slots:
void view(const QString &source, const QString &id,
const QStringList &extraOptions = QStringList());