Ondrej Samohel 386a3d8b5c Merge remote-tracking branch 'origin/develop' into 3.0/refactoring ... # Conflicts: # pype/hosts/harmony/__init__.py		2020-10-13 20:06:00 +02:00
..
blender	first step of pype's reorganization	2020-05-25 18:20:02 +02:00
fusion/scripts/Comp/colorbleed	get up to dat with colorbleed. add 'studio.' to families temporarily	2018-10-16 22:26:42 +02:00
hiero/hiero_plugin_path	Merge remote-tracking branch 'origin/develop' into 3.0/refactoring	2020-10-13 20:06:00 +02:00
houdini	add workfiles to houdini	2019-03-04 19:48:06 +01:00
maya	first step of pype's reorganization	2020-05-25 18:20:02 +02:00
nuke/nuke_path	first step of pype's reorganization	2020-05-25 18:20:02 +02:00