diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-06-17 11:31:59 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-06-17 09:38:10 +0000 |
| commit | 76e2732f013732461c09a1d6c6b4c77fcab1c0d0 (patch) | |
| tree | bca9b5826ef14054c4d3312f4391c9cb3784fbff /Source/JavaScriptCore/runtime/JSModuleNamespaceObject.h | |
| parent | 8b24887dcb8e9ea1fd1b4043795a54bb3d6d3663 (diff) | |
| download | qtwebkit-76e2732f013732461c09a1d6c6b4c77fcab1c0d0.tar.gz | |
fix logical mismerge from 5.6
iphonesimulator_and_iphoneos was renamed to simulator_and_device in 5.7.
Change-Id: If24f96a7404048129db91b42d519e85ce418db07
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'Source/JavaScriptCore/runtime/JSModuleNamespaceObject.h')
0 files changed, 0 insertions, 0 deletions