diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-03 18:18:12 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-03 18:18:12 +0100 |
| commit | b348c9e7b0896f4eda4453c53bfffd5219489cbb (patch) | |
| tree | 2f383b223fd3ba1a8faac28c4576652ec61d34d9 /tests/auto/unit | |
| parent | 33b27c3c15aaca611d5ed0164afa3cd2e9f891a7 (diff) | |
| parent | f39d8b73ee36de7dea09c2acdc9853d821cb1f93 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
src/gsttools/qgstutils.cpp
Change-Id: Ic54ab6c6560ded0db4b98f83256d997bee828083
Diffstat (limited to 'tests/auto/unit')
0 files changed, 0 insertions, 0 deletions