birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
f8e99cd7dd6a10388940c554457adc0ec0b93734
o3de/Code/Tools/ProjectManager
T
History
Esteban Papp f8e99cd7dd Merge branch 'development' into cmake/SPEC-2513_w4244 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
#	Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
2021-08-19 08:53:41 -07:00
..
Platform
Merge pull request #2401 from aws-lumberyard-dev/PM-logs-and-processcheck
2021-08-03 09:32:56 -07:00
Resources
Project Manager: Showing a progress bar when copying projects (#2025)
2021-07-09 18:38:11 +02:00
Source
Merge branch 'development' into cmake/SPEC-2513_w4244
2021-08-19 08:53:41 -07:00
tests
Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de
2021-07-16 17:50:44 -05:00
CMakeLists.txt
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
project_manager_app_files.cmake
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
project_manager_files.cmake
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
project_manager_tests_files.cmake
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00