Jakub Trllo 782957bd0a Merge branch 'release/3.15.x' into feature/OP-4634_Use-qtpy-in-tools ... # Conflicts: # poetry.lock		2023-01-16 18:09:09 +01:00
..
client	resolve conflicts	2022-12-09 19:21:17 +08:00
hooks	resolve conflicts	2022-12-09 19:21:17 +08:00
host	resolve conflicts	2022-12-09 19:21:17 +08:00
hosts	Merge pull request #4006 from ynput/feature/OP-3845_nuke-convert-to-new-publisher	2023-01-11 12:50:45 +01:00
lib	Fix whitespace	2023-01-16 11:50:20 +01:00
modules	Merge branch 'release/3.15.x' into feature/OP-4634_Use-qtpy-in-tools	2023-01-16 18:09:09 +01:00
pipeline	PR comments	2023-01-06 10:54:06 +01:00
plugins	Merge branch 'release/3.15.x' into feature/OP-4634_Use-qtpy-in-tools	2023-01-16 18:09:09 +01:00
resources	resolve conflicts	2022-12-09 19:21:17 +08:00
scripts	non-python host launch script uses qtpy	2022-12-21 13:53:16 +01:00
settings	Merge pull request #4006 from ynput/feature/OP-3845_nuke-convert-to-new-publisher	2023-01-11 12:50:45 +01:00
style	added pyside6 resources	2022-12-21 15:20:21 +01:00
tests	OP-3426 - refactor - replaced check of env var with function	2022-11-07 11:40:15 +01:00
tools	Merge branch 'release/3.15.x' into feature/OP-4634_Use-qtpy-in-tools	2023-01-16 18:09:09 +01:00
vendor	use class attributes from classes	2022-12-21 15:54:46 +01:00
widgets	Merge branch 'release/3.15.x' into feature/OP-4634_Use-qtpy-in-tools	2023-01-16 18:09:09 +01:00
__init__.py
__main__.py
action.py	resolve conflicts	2022-12-09 19:21:17 +08:00
api.py	removed config	2022-09-23 18:49:34 +02:00
cli.py	Merge branch 'develop' into release/3.15.x	2022-12-16 12:09:01 +01:00
plugin.py
pype_commands.py	OP-3426 - fix - wrong flag used in pype_commands	2022-10-24 10:48:14 +02:00
version.py	[Automated] Bump version	2023-01-07 03:27:59 +00:00