projects
/
platform
/
upstream
/
qtmultimedia.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
60fb11d
a0746fe
)
Merge remote-tracking branch 'origin/release' into stable
author
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Wed, 22 Jan 2014 10:36:50 +0000
(11:36 +0100)
committer
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Wed, 22 Jan 2014 10:36:50 +0000
(11:36 +0100)
Change-Id: Ifcb0e0bac29c11980ea2a9d67b12e1b79c4bd9f6
1
2
src/plugins/gstreamer/camerabin/camerabinsession.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/plugins/gstreamer/camerabin/camerabinsession.cpp
Simple merge