diff options
author | Tim Jenssen <tim.jenssen@digia.com> | 2013-04-09 12:40:12 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-04-09 12:40:36 +0200 |
commit | 9c324a7d9e13ddf430381b1a2aa329189748d3c5 (patch) | |
tree | d194f32035bfffc8523778e2d8a586c75526ba7e /src/libs/installer/resources/files-to-patch-linux-emb-arm | |
parent | ac2319b4f0e67da02880bdf1f8832cf3f527c252 (diff) | |
parent | ba4ec89c5eb3b072b9de1bdc149bba409f8fd95b (diff) |
Merge remote-tracking branch 'origin/1.3'
Change-Id: I3936ddf1e70aabc3402769d38c8a79cd50fe9077
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 | 2 |
1 files changed, 1 insertions, 1 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 ea400d715..a1ba5ccb8 100644 --- a/src/libs/installer/resources/files-to-patch-linux-emb-arm +++ b/src/libs/installer/resources/files-to-patch-linux-emb-arm @@ -4,5 +4,5 @@ bin/lrelease *.la *.prl *.pc -*.pri + |