diff options
| author | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-01-16 18:24:17 +0100 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-01-16 18:24:17 +0100 |
| commit | 0fc1516692fb11f3489bce11a8f0cc15ad8f6b63 (patch) | |
| tree | d39aa29c33b87430598fe17751a7d65529792660 /tests | |
| parent | db2f69bb58ab369e44ea8bb30dcdbe90660578a2 (diff) | |
| parent | ae657b918ff22da2553dc577c877b03f49cc2bdf (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/3rdparty
Change-Id: Ied43de29444d4803218e250b096b9c72bc017af7
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions