diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-07-02 14:44:27 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-07-02 14:44:55 +0200 |
| commit | 2ad4749c8aa924e2dd8b245309e7b585b9329f7f (patch) | |
| tree | 781a4f12f564380204dc1b863ef11303b823c781 /share | |
| parent | a22cadc6078e8f0c29bd8eb6f249b0bcd9357fc5 (diff) | |
| parent | 37d7dea3d3db3bd47a5e921de1cf54d48a8736d5 (diff) | |
Merge remote-tracking branch 'origin/1.2'
Change-Id: I9d5874b3867d3b366e418ae101c25b518053b00a
Diffstat (limited to 'share')
| -rw-r--r--[-rwxr-xr-x] | share/qbs/imports/qbs/base/NSISSetup.qbs | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | share/qbs/modules/nsis/NSISModule.qbs | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/share/qbs/imports/qbs/base/NSISSetup.qbs b/share/qbs/imports/qbs/base/NSISSetup.qbs index f52398a2a..f52398a2a 100755..100644 --- a/share/qbs/imports/qbs/base/NSISSetup.qbs +++ b/share/qbs/imports/qbs/base/NSISSetup.qbs diff --git a/share/qbs/modules/nsis/NSISModule.qbs b/share/qbs/modules/nsis/NSISModule.qbs index ad8b84238..ad8b84238 100755..100644 --- a/share/qbs/modules/nsis/NSISModule.qbs +++ b/share/qbs/modules/nsis/NSISModule.qbs |