projects
/
platform
/
upstream
/
qtmultimedia.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f15105a
2c7e734
)
Merge remote-tracking branch 'origin/stable' into dev
author
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Wed, 20 Nov 2013 15:43:44 +0000
(16:43 +0100)
committer
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Wed, 20 Nov 2013 15:43:45 +0000
(16:43 +0100)
Change-Id: I25197ccc930730be363f8f65624d7fa10c1d33e9
1
2
src/plugins/qnx/camera/bbcamerasession.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/plugins/qnx/camera/bbcamerasession.cpp
Simple merge