diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-16 20:53:47 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-16 20:53:47 +0200 |
| commit | 188b59609b1c01792b63e02e8c230616b93f5c51 (patch) | |
| tree | 68ee0d8ef4296f8e936d17e75ceabdb4227e80dc /examples/multimedia/video | |
| parent | 291f1229feff087ac9a850ec7a92152f1b69af58 (diff) | |
| parent | df4336a84426c84e692df86172cc0bf381261830 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ibcde5cfcb97948f9e3f71a2d6b06397e1003aa3b
Diffstat (limited to 'examples/multimedia/video')
0 files changed, 0 insertions, 0 deletions