projects / platform / upstream / qtimageformats.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 59354c5 015d611)
Merge remote-tracking branch 'origin/5.4' into dev
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Wed, 17 Dec 2014 15:53:07 +0000 (16:53 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Wed, 17 Dec 2014 15:53:07 +0000 (16:53 +0100)
Conflicts:
.qmake.conf

Change-Id: I24c15b9824a6a2a68d1cb3d0aef0650e024164d6


Trivial merge
Domain: UI Framework / Qt;