index
:
delta/qt-creator.git
0.9.1-beta
0.9.2-rc1
1.0.0
1.1
1.2
1.2.90
1.3
1.3.0
1.3.0-beta
1.3.1
10.0
2.0
2.0.0
2.0.0-beta
2.0.1
2.1
2.1.0
2.2
2.3
2.4
2.5
2.6
2.7
2.8
3.0
3.1
3.2
3.3
3.4
3.5
3.6
4.0
4.1
4.10
4.11
4.12
4.13
4.14
4.15
4.2
4.3
4.4
4.5
4.6
4.7
4.8
4.9
5.0
6.0
7.0
8.0
9.0
at-3.4
at-3.5
at-3.6
at-master
baserock/3.3.0
baserock/morph/2.7
baserock/v3.6.1
csa-3.3
csa-3.4
csa-3.5
csa-3.6
csa-master
drafts/for/4.3
drafts/for/master
master
qds-1.50
qds-1.59
qds-2.3
qds-3.0
qds-3.1
qds-3.2
qds-3.3
qds-3.4
qds-3.5
qds-3.6
qds-3.7
qds/3.8
qds/3.9
qds/4.0
qds/4.1
qds/dev
qmlprojectstorage
qp-2.8
qp-3.0
qp-3.1
qp-3.2
qp-3.3
qp-3.4
qp-3.5
qp-3.6
qp-master
refsfor/3.0
wip/at-squish
wip/boostbuildprojectmanager
wip/clang
wip/clang-oop
wip/clang-query
wip/qbs
wip/vcproj
wip/winrt
code.qt.io: qt-creator/qt-creator.git
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
src
/
plugins
/
git
/
mergetool.h
Commit message (
Expand
)
Author
Age
Files
Lines
*
Git: Modernize
Orgad Shaneh
2018-09-19
1
-2
/
+2
*
Git: clean forward declaration
Laurent Montel
2017-09-28
1
-2
/
+0
*
Git: Make mergetool parsing more robust
Orgad Shaneh
2016-11-09
1
-0
/
+1
*
Git: Avoid QProcess::waitForReadyRead in MergeTool
Orgad Shaneh
2016-09-20
1
-1
/
+1
*
Git: Do not rely on QProcess::readData/writeData in MergeTool
Orgad Shaneh
2016-09-20
1
-2
/
+3
*
Git: Prompt for unchanged file after custom mergetool fails
Orgad Shaneh
2016-06-24
1
-0
/
+1
*
Git: Modernize
Tobias Hunger
2016-02-10
1
-10
/
+6
*
Update License according to agreement with Free Qt Foundation
Tobias Hunger
2016-01-19
1
-17
/
+12
*
Git: Use Qt5-style connects
Tobias Hunger
2015-11-23
1
-2
/
+1
*
Git: s/GitPlugin::gitClient/GitPlugin::client/
Tobias Hunger
2015-04-08
1
-1
/
+1
*
Update License
Eike Ziller
2015-01-16
1
-6
/
+6
*
License update
Eike Ziller
2014-10-09
1
-7
/
+8
*
Incremented year in copyright info
Robert Loehning
2014-01-08
1
-1
/
+1
*
Git: Move some functions from MergeTool to GitClient
Orgad Shaneh
2013-03-01
1
-2
/
+0
*
Git: Handle "no changes" case on conflict resolving
Orgad Shaneh
2013-02-12
1
-1
/
+1
*
Incremented year in copyright info
Robert Loehning
2013-02-01
1
-1
/
+1
*
Git: Added Revert and cherry-pick
Petar Perisin
2013-01-21
1
-0
/
+4
*
Git: Write mergetool input/output to VCS output window
Orgad Shaneh
2012-11-16
1
-2
/
+3
*
Git: Introduce MergeTool support
Orgad Shaneh
2012-11-07
1
-0
/
+93
