diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-22 16:27:17 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-22 16:28:32 +0100 |
| commit | 5ac2ce5f4810092cd2135663160017e81d6c96a4 (patch) | |
| tree | a94da5914d1ad0cce95c0556c819950d89f5ac74 /src/plugins/plugins.pro | |
| parent | 503eec194ea8bc70bfdbfd06bd0832a77cfcc137 (diff) | |
| parent | 969dc839c3b0028e821d15015f99bd70d76fbc03 (diff) | |
Merge remote-tracking branch 'origin/dev' into stable
These two patches should have targeted 5.1 and went in just
at the wrong time.
Change-Id: Idd0a7a812fb11e2aea2c187d5e82aa31494c576c
Diffstat (limited to 'src/plugins/plugins.pro')
0 files changed, 0 insertions, 0 deletions