projects
/
platform
/
upstream
/
qtmultimedia.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4ba4f1a
8da6115
)
Merge remote-tracking branch 'origin/5.3' into dev
author
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Thu, 10 Jul 2014 08:14:36 +0000
(10:14 +0200)
committer
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Thu, 10 Jul 2014 08:14:36 +0000
(10:14 +0200)
Change-Id: I38ebcb3da0e4d2acc9e7108c9579ea98323864e0
1
2
src/imports/multimedia/qdeclarativecamera.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/imports/multimedia/qdeclarativecamera.cpp
Simple merge