summaryrefslogtreecommitdiffstats
path: root/tests/auto/installer/installer.pro
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@digia.com>2013-04-23 13:26:42 +0200
committerTim Jenssen <tim.jenssen@digia.com>2013-04-23 13:26:42 +0200
commit1ee847c0dd56fcfbe2d93d64120789083c7a5bcf (patch)
tree36c1f524f28e92a56266f452f115ecdd3173fbc0 /tests/auto/installer/installer.pro
parentd7f58f9f589c7de1a34e73ab4fda48a06a6b4ee4 (diff)
parentbbd2cab7c4097a0776c28a5e1d4cc2f8b66b53c1 (diff)
Merge remote-tracking branch 'origin/1.3'
Conflicts: src/libs/installer/lib7z_facade.h Change-Id: I045ca5e4a2a76e5e651bbedc613f086bd60d563d
Diffstat (limited to 'tests/auto/installer/installer.pro')
0 files changed, 0 insertions, 0 deletions