diff options
author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-04 12:42:24 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-04 13:02:42 +0200 |
commit | 1be5082af805e71ce2ca6ed04ff5de0f069da770 (patch) | |
tree | 55d89790592f7391c7587e1432ae462cd58e9c5a /LGPL_EXCEPTION.txt | |
parent | 8482b4da46505c725d93a1e0478ded99bcbde4d2 (diff) | |
parent | 09b8632d301ffa865bf717c5497b6b7a17e86b53 (diff) |
Merge remote-tracking branch 'origin/2.0'
Conflicts:
src/libs/installer/packagemanagercore.cpp
Change-Id: Ie3d94fe3a633e189c260bf20682c00a2bb901bc8
Diffstat (limited to 'LGPL_EXCEPTION.txt')
0 files changed, 0 insertions, 0 deletions