projects / platform / upstream / qtmultimedia.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d415d32 150ff66)
Merge remote-tracking branch 'origin/5.3' into dev
authorSergio Ahumada <sahumada@blackberry.com>
Sat, 14 Jun 2014 19:59:24 +0000 (21:59 +0200)
committerSergio Ahumada <sahumada@blackberry.com>
Sat, 14 Jun 2014 19:59:24 +0000 (21:59 +0200)
Conflicts:
.qmake.conf

Change-Id: Iecd8d7b94e52a8981526b12cffa40e99870ba62f

1  2 
src/multimedia/video/qvideoframe.cpp patch | diff1 | diff2 | blob | history

diff --cc src/multimedia/video/qvideoframe.cpp
Simple merge
Domain: UI Framework / Qt;