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

Change-Id: Ib2c94071cee5846db9b16ee4d3e9aeb897e9070e


Trivial merge
Domain: UI Framework / Qt;