Kayla Man 56c66d9b6a Merge branch 'develop' into bugfix/OP-3022-Look-publishing-and-srgb-colorspace-in-Maya-2022		2023-02-01 15:07:47 +08:00
..
project_anatomy	Merge branch 'release/3.15.x' into feature/OP-2479_color-v3-Colorspace-management-and-distribution	2023-01-18 18:01:23 +01:00
project_settings	Merge branch 'develop' into bugfix/OP-3022-Look-publishing-and-srgb-colorspace-in-Maya-2022	2023-02-01 15:07:47 +08:00
system_settings	resolve conflicts	2022-12-09 19:21:17 +08:00