diff options
author | Jose <jose@zeroc.com> | 2018-02-05 08:34:31 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2018-02-05 08:34:31 +0100 |
commit | 5b1531275cc5553cc728eecbfa91a89fcd9305b3 (patch) | |
tree | 2f98bbd478344806766d1322155ee5a4f5e2794b /cpp/test/ios/controller/Classes | |
parent | Fixes to support zeroc.icebuilder.msbuild tasks (diff) | |
parent | Fixed PHP array initialization in test proxy client (diff) | |
download | ice-5b1531275cc5553cc728eecbfa91a89fcd9305b3.tar.bz2 ice-5b1531275cc5553cc728eecbfa91a89fcd9305b3.tar.xz ice-5b1531275cc5553cc728eecbfa91a89fcd9305b3.zip |
Merge remote-tracking branch 'origin/3.7' into netcore
Diffstat (limited to 'cpp/test/ios/controller/Classes')
2 files changed, 6 insertions, 0 deletions
diff --git a/cpp/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/Contents.json b/cpp/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/Contents.json index d4e114a8919..86a429b461b 100644 --- a/cpp/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/cpp/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -101,6 +101,12 @@ "idiom" : "ipad", "filename" : "test_suite-Small-83,5@2x-1.png", "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "test_suite-AppStore.png", + "scale" : "1x" } ], "info" : { diff --git a/cpp/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/test_suite-AppStore.png b/cpp/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/test_suite-AppStore.png Binary files differnew file mode 100644 index 00000000000..978407a98c4 --- /dev/null +++ b/cpp/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/test_suite-AppStore.png |