projects / platform / upstream / qtmultimedia.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1dbca5 63cff37)
Merge remote-tracking branch 'origin/5.5' into dev
authorLiang Qi <liang.qi@theqtcompany.com>
Wed, 8 Apr 2015 19:24:43 +0000 (21:24 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Wed, 8 Apr 2015 19:24:43 +0000 (21:24 +0200)
Change-Id: I17ddd1ce77e07cf75567e2dc723e29d54088f68e


Trivial merge
Domain: UI Framework / Qt;