diff options
| author | Iikka Eklund <iikka.eklund@theqtcompany.com> | 2016-01-20 14:18:22 +0200 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@theqtcompany.com> | 2016-01-20 14:18:30 +0200 |
| commit | 2af57eb8c8351e09f3224128b3593aa160c6c424 (patch) | |
| tree | 410ee4a7da7485937f21fd2d11e0cb12cdfb61f8 /.qt-license-check.optional | |
| parent | 8bf239c376285f9f5254d78ad263d46ceb944a33 (diff) | |
| parent | 0a54640535049bf5124a7b4414bb75a8b2075087 (diff) | |
Merge remote-tracking branch 'origin/2.0'
Conflicts:
installerfw.pri
src/libs/kdtools/kdgenericfactory.cpp
src/libs/kdtools/kdgenericfactory.h
src/libs/kdtools/kdupdaterapplication.cpp
src/libs/kdtools/kdupdaterapplication.h
src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp
src/libs/kdtools/kdupdaterupdatesourcesinfo.h
sync.profile
Change-Id: Ifdc8b065f89b7e241bd3788ed79768e21888161f
Diffstat (limited to '.qt-license-check.optional')
| -rw-r--r-- | .qt-license-check.optional | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.qt-license-check.optional b/.qt-license-check.optional new file mode 100644 index 000000000..f24103ba2 --- /dev/null +++ b/.qt-license-check.optional @@ -0,0 +1 @@ +^src/libs/kdtools/ |