diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 16:53:41 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 16:53:41 +0100 |
| commit | 47698fc57fbc66f4b2921eeedb9cb8e71f8fb2d9 (patch) | |
| tree | ed7cd0b18c15f8ec57c26011e5aa3dddb15bdb5d /src/gsttools/qgstappsrc.cpp | |
| parent | aa38d3dfb16e76e8e2ce2d270020a6cb5cc8d3e9 (diff) | |
| parent | a864bfa4129f27f744ad223bbd14460afc049670 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I31e377cdccf8bf5c1ea8143faf2001ac99608c27
Diffstat (limited to 'src/gsttools/qgstappsrc.cpp')
0 files changed, 0 insertions, 0 deletions