Chris Galvan d7574777a8 Resolved merge conflicts ...

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

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

..

DPIAware.xml

Add newlines to the end of all files

2021-04-23 09:43:40 -07:00

launcher_game_windows_files.cmake

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

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

Launcher_Game_Windows.cpp

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

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

launcher_project_windows.cmake

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

Launcher_Traits_Windows.h

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

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

Launcher_Windows.cpp

Resolved merge conflicts

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

Launcher.rc.in

Add newlines to the end of all files

2021-04-23 09:43:40 -07:00

LauncherUnified_traits_windows.cmake

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

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

platform_windows_files.cmake

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

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

platform_windows.cmake

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

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