diff options
| author | Eike Ziller <[email protected]> | 2023-12-14 17:49:36 +0100 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2023-12-14 18:03:59 +0100 |
| commit | 64f0e10a4e3c81fea61ea63d60eaa6f781c256cc (patch) | |
| tree | e2dec2d444f4fb7f2f41c6900b13fb45a3237f77 /src/plugins/terminal/shellintegrations | |
| parent | ef91b41663fbfe1b50dc7f3541620d7a8b3e53d6 (diff) | |
| parent | d24e5752782c037bb17090afd43c9b63fba1bc29 (diff) | |
Merge remote-tracking branch 'origin/12.0'
Conflicts:
src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
src/plugins/remotelinux/killappstep.cpp
Change-Id: Ife961ca4eb14271c48bd0dbc08e0a0a816935682
Diffstat (limited to 'src/plugins/terminal/shellintegrations')
0 files changed, 0 insertions, 0 deletions