You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

santorac 74f6d1ec74 Cleanup up and resolving conflicts after the latest merge. ... Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>		4 years ago
..
Document	Cleanup up and resolving conflicts after the latest merge.	4 years ago
Platform	Atom Tools: removing unused traits for ME executable extension	4 years ago
Viewport	Updating comments	4 years ago
Window	Atom Tools: Document system exposes reflected object data	4 years ago
MaterialEditorApplication.cpp	Atom Tools: Document system exposes reflected object data	4 years ago
MaterialEditorApplication.h	Atom Tools: Removing unnecessary modules, components, and dead code from ME	4 years ago
main.cpp	AtomTools: moved more startup code from main cpp files into the base application class	4 years ago
resource.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago