projects / platform / upstream / qtmultimedia.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c8be63 9b7fd8c)
Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:03:52 +0000 (16:03 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:03:52 +0000 (16:03 +0100)
Conflicts:
.qmake.conf

Change-Id: I6ea9c40c69f55fa733fd9000a57d570fff21f1e9


Trivial merge
Domain: UI Framework / Qt;