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

Change-Id: I62a3095e4a4d507de199fac32b64e9e76323bbf4

1  2 
src/multimedia/multimedia.pro patch | diff1 | diff2 | blob | history

diff --cc src/multimedia/multimedia.pro
Simple merge
Domain: UI Framework / Qt;