Merge branch 'develop' into feature/OP-1915_flame-ftrack-direct-link

This commit is contained in:
Jakub Jezek 2021-11-09 11:00:46 +01:00
commit fcb130b4df
No known key found for this signature in database
GPG key ID: D8548FBF690B100A
171 changed files with 16621 additions and 1476 deletions

View file

@ -1012,8 +1012,6 @@
},
"variants": {
"2020": {
"enabled": true,
"variant_label": "2020",
"executables": {
"windows": [
"C:\\Program Files\\Adobe\\Adobe Photoshop 2020\\Photoshop.exe"
@ -1029,8 +1027,6 @@
"environment": {}
},
"2021": {
"enabled": true,
"variant_label": "2021",
"executables": {
"windows": [
"C:\\Program Files\\Adobe\\Adobe Photoshop 2021\\Photoshop.exe"
@ -1044,6 +1040,21 @@
"linux": []
},
"environment": {}
},
"2022": {
"executables": {
"windows": [
"C:\\Program Files\\Adobe\\Adobe Photoshop 2022\\Photoshop.exe"
],
"darwin": [],
"linux": []
},
"arguments": {
"windows": [],
"darwin": [],
"linux": []
},
"environment": {}
}
}
},