projects / platform / upstream / qtimageformats.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e77e64a 2e0e26d)
Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 4 Jun 2013 17:46:58 +0000 (19:46 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 4 Jun 2013 17:46:58 +0000 (19:46 +0200)
Conflicts:
.qmake.conf
sync.profile

Change-Id: I8f788167e37c9b9ca3f4a59a9785a435eeaa6317


Trivial merge
Domain: UI Framework / Qt;