diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-10-23 17:09:23 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-10-23 17:09:23 +0200 |
| commit | 7778787b91a9ec75a3fcba70b7d39d64a034997c (patch) | |
| tree | e589d8bea9713e38111c0b640a2cf63a425585b2 /src/libs/installer/resources/files-to-patch-linux-emb-arm | |
| parent | 5cc89ac1eab55dfbd8a1ad754cbb2c8f7c424abc (diff) | |
| parent | 53b999af27bf2272445b882c055aa6cf8335c74a (diff) | |
Merge remote-tracking branch 'origin/1.4' into 1.5
Change-Id: Ib2d382d1aa398b642dc15f4df7c03b19bf638546
Diffstat (limited to 'src/libs/installer/resources/files-to-patch-linux-emb-arm')
| -rw-r--r-- | src/libs/installer/resources/files-to-patch-linux-emb-arm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/installer/resources/files-to-patch-linux-emb-arm b/src/libs/installer/resources/files-to-patch-linux-emb-arm index f6a4b59b7..8ea297b50 100644 --- a/src/libs/installer/resources/files-to-patch-linux-emb-arm +++ b/src/libs/installer/resources/files-to-patch-linux-emb-arm @@ -8,5 +8,5 @@ host-bin/qdoc *.la *.prl *.pc - - +*.pri +*.cmake |