summaryrefslogtreecommitdiff
path: root/src/plugins/git/mergetool.h
diff options
context:
space:
mode:
authorVikas Pachdha <vikas.pachdha@qt.io>2016-09-16 15:12:42 +0200
committerVikas Pachdha <vikas.pachdha@qt.io>2016-09-20 09:52:59 +0000
commit0c187a2b12225fa484318c3360c8be32fe065583 (patch)
tree7e9ce7a9d3c257af6b0952314bd78029ca2d8dd3 /src/plugins/git/mergetool.h
parent177fce82a3bdba780bb55f3451b22a6b312482ef (diff)
downloadqt-creator-0c187a2b12225fa484318c3360c8be32fe065583.tar.gz
iOS: Fixes QML debugging on iOS device
Task-number: QTCREATORBUG-15812 Change-Id: I7c495457961bad89ba3a1ca6a19dcd018c4e3a5b Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/git/mergetool.h')
0 files changed, 0 insertions, 0 deletions