diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-06-17 15:05:14 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-06-17 15:05:14 +0200 |
| commit | 1a103f7a90b51022aa10da228deb566cd7b446ca (patch) | |
| tree | 088047e49c93ee28770d9a819a5dabcb7c8cbbf9 /share | |
| parent | b5953a0c2967bb126c6281ffb1a6c3f625f9ed1f (diff) | |
| parent | d40b92e506af0e97bebd13c7410553f6d74d3af2 (diff) | |
Merge 1.5 into master.
Change-Id: I93e4943cf8112ce1088c34a43928d2133bc7dca7
Diffstat (limited to 'share')
0 files changed, 0 insertions, 0 deletions