diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:50:42 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:50:42 +0200 |
| commit | f2a0dbe9128d5fd6caa8711b8b7495eba570ba63 (patch) | |
| tree | ee75e8d496116646f068a4d1664002cc20f866a9 /tests | |
| parent | 629b71dc8fdd08d0992fbd9adbf7e3fc7f00c160 (diff) | |
| parent | 024bfcc5c86c9b6f14b46e352818c059008b9a72 (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: I24d21a3aabd24dea0540b3abe56f386bdfacb3ee
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions