projects / platform / upstream / qttools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44ce983 5cfb1a9)
Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:08:17 +0000 (16:08 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:08:17 +0000 (16:08 +0100)
Conflicts:
.qmake.conf

Change-Id: I8d55441489d74fdf75f140efcb6e09f77ada2082


Trivial merge
Domain: UI Framework / Qt;