Chris Galvan d7574777a8 Resolved merge conflicts ...

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

2021-07-02 12:42:44 -05:00

..

launcher_game_ios_files.cmake

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

Launcher_iOS.mm

Resolved merge conflicts

2021-07-02 12:42:44 -05:00

launcher_project_ios.cmake

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

Launcher_Traits_iOS.h

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

Launcher_Traits_Platform.h

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

LauncherUnified_traits_ios.cmake

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

O3DEApplication_iOS.mm

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

O3DEApplicationDelegate_iOS.mm

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

platform_ios_files.cmake

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

platform_ios.cmake

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00