Roy Nieterau aa20e3d42b Merge remote-tracking branch 'upstream/develop' into bugfix/maya_burnin_focallength_renders ... # Conflicts: # openpype/settings/defaults/project_settings/global.json		2023-04-12 17:06:51 +02:00
..
aftereffects.json	resave default settings	2023-02-22 17:54:17 +01:00
applications.json	Merge develop	2023-03-29 14:46:41 +02:00
blender.json	Merge develop	2023-03-29 14:46:41 +02:00
celaction.json	Merge develop	2023-03-29 14:46:41 +02:00
deadline.json	Merge develop	2023-03-29 14:46:41 +02:00
flame.json	flame: adding extensions to loaders	2023-02-28 11:30:39 +01:00
ftrack.json	resave default settings	2023-02-22 17:54:17 +01:00
fusion.json	Merge develop	2023-03-29 14:46:41 +02:00
global.json	Merge remote-tracking branch 'upstream/develop' into bugfix/maya_burnin_focallength_renders	2023-04-12 17:06:51 +02:00
harmony.json	resave default settings	2023-02-22 17:54:17 +01:00
hiero.json	adding monitorOut to colorspace settings	2023-04-11 14:36:30 +02:00
houdini.json	resave default settings	2023-02-22 17:54:17 +01:00
kitsu.json	Merge develop	2023-03-29 14:46:41 +02:00
max.json	Merge develop	2023-03-29 14:46:41 +02:00
maya.json	modify default value for custom namespace settings	2023-04-07 15:17:02 +02:00
nuke.json	nuke: settings and mixin for some validators	2023-04-06 15:27:05 +02:00
photoshop.json	resave default settings	2023-02-22 17:54:17 +01:00
resolve.json	resave default settings	2023-02-22 17:54:17 +01:00
royalrender.json	resave default settings	2023-02-22 17:54:17 +01:00
shotgrid.json	resave default settings	2023-02-22 17:54:17 +01:00
slack.json	resave default settings	2023-02-22 17:54:17 +01:00
standalonepublisher.json	resave default settings	2023-02-22 17:54:17 +01:00
traypublisher.json	resave default settings	2023-02-22 17:54:17 +01:00
tvpaint.json	Merge develop	2023-03-29 14:46:41 +02:00
unreal.json	resave default settings	2023-02-22 17:54:17 +01:00
webpublisher.json	resave default settings	2023-02-22 17:54:17 +01:00