projects
/
platform
/
upstream
/
qttools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e2bcb43
b73a47a
)
Merge remote-tracking branch 'origin/5.4' into 5.5
author
Liang Qi
<liang.qi@theqtcompany.com>
Wed, 19 Aug 2015 14:34:30 +0000
(16:34 +0200)
committer
Liang Qi
<liang.qi@theqtcompany.com>
Wed, 19 Aug 2015 14:34:30 +0000
(16:34 +0200)
Conflicts:
examples/designer/doc/src/arthurplugin.qdoc
Change-Id: I5c0118a90111b51db04d2ea2eb6b3c47f1fb761f
Trivial merge
projects / platform / upstream / qttools.git / commitdiff