diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-20 16:24:08 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-20 16:24:08 +0200 |
| commit | 84bb67bb2a0ed91110c4034b85cabbae4c4ff238 (patch) | |
| tree | 295685fd55e75ac37f8240ff183029b9ed7a8a48 /src/controls/plugin.cpp | |
| parent | dff9daaddcd52079b520c112e58155abe9e9f7f7 (diff) | |
| parent | f5f818e3adfa9d39c4955ffe34443027427a7f74 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I08068004ecb6269c032595e86a164705ce9e4f39
Diffstat (limited to 'src/controls/plugin.cpp')
0 files changed, 0 insertions, 0 deletions