diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2015-02-17 16:12:14 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2015-02-17 16:12:27 +0100 |
| commit | e49d92959c59f7d9650a37b1860c556e5d0cf2a3 (patch) | |
| tree | 4c374000ffc16efa5901396bfd64bca1a191b7a7 /src/plugins/gstreamer/camerabin/camerabinsession.cpp | |
| parent | df66e8a4ba6d2cf8b245c99dd54877d36fb8561d (diff) | |
| parent | 36e90b6928bf7d48bbea168b9ffc62448f2b10a9 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I89bfde0a1618ebf3b34948c1c1f74c2cbf5d8abf
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinsession.cpp')
0 files changed, 0 insertions, 0 deletions