Commit Graph

Select branches

Hide Pull Requests

4772-pane-scrollbars-on-causes-alt-screen-to-flicker

5211-fix-select-layout-list-windows

command_parser

floating_panes

layouts

master

release_3.7b

ta/kitty-img

#1

#1

#1014

#1014

#1016

#1016

#1033

#1033

#1034

#1034

#1037

#1037

#1038

#1038

#1039

#1039

#1041

#1041

#1050

#1050

#1051

#1051

#1062

#1062

#1071

#1071

#1072

#1073

#1073

#1075

#1075

#1096

#1096

#1097

#1097

#1100

#1100

#1102

#1102

#1103

#1103

#112

#112

#1123

#1123

#1124

#1124

#1139

#1139

#1140

#1140

#1144

#1144

#1147

#1147

#1161

#1161

#1165

#1184

#1184

#121

#121

#122

#122

#123

#123

#124

#124

#1247

#1247

#125

#125

#1262

#1262

#1263

#1263

#1274

#1274

#1275

#1275

#1276

#1276

#1283

#1283

#1284

#1284

#1289

#1289

#1290

#1290

#1294

#1294

#1298

#1298

#130

#130

#1306

#1306

#1309

#1309

#1323

#133

#133

#1339

#1339

#1343

#1343

#1358

#1358

#1359

#1359

#1372

#1372

#1374

#1374

#1376

#1376

#1377

#1377

#1380

#1380

#1381

#1381

#1385

#1385

#1386

#1386

#1389

#1389

#1394

#1394

#1395

#1395

#1398

#1398

#1404

#1404

#1414

#1414

#1434

#1434

#1440

#1440

#1443

#1443

#1444

#1444

#1450

#1450

#1460

#1460

#1464

#1464

#1465

#1465

#1466

#1466

#1475

#1475

#1487

#1487

#1495

#1495

#15

#15

#1545

#1548

#1556

#1558

#1564

#1589

#1594

#1595

#1601

#1611

#162

#162

#1620

#1628

#163

#163

#1633

#1644

#1650

#1653

#1670

#1674

#1676

#1685

#1697

#1702

#1703

#173

#173

#1731

#1733

#1734

#1735

#174

#174

#1741

#1742

#1743

#1748

#1758

#1761

#1768

#1771

#1773

#1782

#1785

#1798

#1802

#1805

#1819

#1848

#185

#185

#1857

#1869

#1875

#1883

#1891

#1892

#1899

#19

#19

#190

#190

#1900

#1906

#1907

#1912

#1914

#1915

#1920

#1921

#1924

#1933

#1934

#1943

#1944

#1945

#1950

#1951

#1955

#1958

#1964

#1982

#1985

#1986

#1988

#2

#2

#20

#20

#2001

#2010

#2014

#2020

#2030

#2034

#2038

#2046

#2051

#2067

#2068

#2075

#2079

#2080

#2086

#2087

#2097

#210

#210

#2106

#2112

#2115

#2119

#2123

#2125

#2128

#2129

#2130

#2131

#2142

#2151

#2152

#2161

#2162

#2164

#2172

#218

#218

#2195

#2198

#2209

#221

#221

#2219

#2270

#2271

#2288

#2299

#23

#23

#2304

#2309

#2317

#2322

#234

#234

#2343

#235

#235

#2359

#236

#236

#2378

#2381

#2382

#2385

#2386

#2388

#2389

#2390

#2392

#2395

#2399

#2400

#2403

#2404

#2405

#2406

#2413

#2422

#243

#243

#2436

#2442

#2448

#2453

#2457

#246

#246

#2463

#2465

#247

#247

#2474

#2476

#248

#248

#2491

#2497

#251

#251

#252

#252

#2525

#2546

#2553

#2558

#2561

#2569

#2571

#2573

#2582

#2589

#259

#259

#2590

#2599

#2604

#2605

#261

#261

#2614

#2621

#2628

#2631

#2633

#2648

#2651

#2655

#2656

#2660

#2664

#2673

#2678

#2692

#2693

#2695

#2724

#2729

#273

#273

#2736

#2739

#2741

#2744

#275

#275

#2755

#2763

#2765

#277

#277

#2802

#2803

#2807

#2824

#2851

#2873

#2875

#2875

#2890

#2899

#2900

#2918

#2922

#2924

#2927

#2929

#293

#293

#2930

#2931

#2935

#2936

#2937

#294

#294

#2941

#2942

#2946

#2947

#2950

#2951

#2954

#2958

#2959

#2960

#2961

#2962

#2967

#2968

#297

#297

#2977

#3

#3

#30

#30

#3003

#3012

#3019

#3022

#3023

#3025

#303

#303

#3038

#306

#306

#3079

#3093

#3116

#3119

#3121

#3129

#3145

#3145

#3148

#3160

#3165

#3184

#3196

#3201

#3202

#3204

#3209

#3212

#3223

#3240

#3247

#325

#325

#3255

#3259

#3263

#3267

#3268

#3269

#3274

#3286

#3297

#3298

#3300

#3301

#3302

#3307

#3308

#3313

#3319

#3324

#3332

#3358

#336

#336

#3363

#3368

#3372

#3380

#3385

#3408

#3421

#3431

#3459

#3465

#3467

#3471

#348

#348

#3496

#3498

#35

#35

#3501

#3507

#3508

#3509

#3514

#3527

#3548

#355

#355

#3573

#3577

#3579

#3586

#3588

#3590

#3592

#3595

#3596

#3604

#3606

#3607

#3612

#3619

#3620

#3621

#3626

#3630

#3631

#3641

#3647

#3648

#3649

#3650

#3661

#3665

#3666

#367

#367

#3673

#3679

#3709

#373

#373

#3738

#3740

#3747

#3750

#3762

#3789

#3798

#38

#38

#3806

#3809

#382

#382

#3830

#3840

#3847

#3851

#3860

#3863

#3869

#3872

#3874

#3877

#3886

#3888

#3890

#3891

#3892

#3893

#3897

#3898

#3899

#390

#390

#3901

#3902

#3903

#3908

#3915

#3919

#392

#392

#3930

#3933

#3941

#3958

#396

#396

#3961

#3962

#3972

#3973

#3975

#3979

#3982

#399

#399

#3995

#4

#4

#401

#401

#4013

#4014

#4015

#4030

#4036

#4037

#4038

#4039

#4040

#4041

#4042

#4043

#4054

#406

#406

#4068

#4076

#4080

#4082

#4084

#4085

#4086

#4088

#4093

#4094

#4095

#4096

#4097

#4106

#4108

#412

#412

#4121

#4122

#4126

#4137

#4137

#4138

#4148

#4149

#4153

#416

#416

#4164

#4170

#4176

#4178

#4179

#4180

#4184

#4190

#4191

#4192

#4194

#4195

#4201

#4203

#4206

#4209

#421

#421

#4212

#4221

#4222

#4223

#4231

#4233

#4239

#4241

#4242

#4246

#4247

#4253

#4254

#4256

#4257

#4260

#4266

#4274

#4301

#4303

#4312

#432

#432

#4322

#434

#434

#4348

#4351

#4352

#4353

#4360

#4361

#4363

#4364

#4371

#4372

#4374

#4375

#4376

#4378

#4379

#4384

#4399

#4401

#4410

#4411

#4414

#4415

#4419

#4420

#4422

#4435

#4437

#4439

#444

#444

#4441

#4444

#4445

#4446

#4450

#4451

#4455

#4463

#4469

#4470

#4472

#4478

#448

#448

#4481

#4485

#4488

#4490

#4492

#4495

#4496

#45

#45

#4505

#451

#451

#4513

#4515

#4516

#4519

#453

#453

#4534

#4539

#4542

#4546

#4550

#4551

#456

#456

#4560

#4568

#4570

#4577

#4580

#4581

#4587

#4588

#4596

#4600

#4604

#4605

#4608

#461

#461

#4612

#4613

#4614

#4615

#4616

#4618

#4621

#4622

#4623

#4625

#4626

#4627

#4630

#4635

#4636

#464

#464

#4649

#4655

#466

#466

#4662

#4665

#4666

#4678

#4688

#4696

#4697

#4701

#4703

#471

#471

#4720

#4724

#4728

#473

#473

#4730

#4731

#4736

#4738

#4744

#4746

#4747

#4748

#4748

#4750

#4751

#4753

#4754

#4760

#4765

#4766

#4767

#4768

#4771

#4773

#4778

#4781

#4786

#4788

#4790

#4795

#4797

#4799

#480

#480

#4802

#4804

#4812

#4813

#4818

#4819

#4822

#4825

#4827

#4828

#4829

#4830

#4832

#4841

#4845

#4848

#4849

#4856

#4858

#4861

#4862

#4865

#4866

#4866

#4868

#4869

#4871

#4881

#4882

#4884

#4885

#4887

#4889

#4892

#4893

#4895

#4898

#4899

#4900

#4903

#4903

#4906

#4908

#4911

#4912

#4914

#4916

#4920

#4922

#4925

#4926

#4927

#4928

#4929

#4930

#4933

#4934

#4935

#4936

#4937

#4938

#4939

#4940

#4943

#4944

#4946

#4948

#4949

#4951

#4953

#4954

#4955

#4957

#4958

#4965

#4967

#4968

#4972

#4973

#4978

#4979

#4980

#4981

#4989

#4990

#4991

#4993

#4993

#4996

#4997

#4998

#4999

#5001

#5004

#5005

#5007

#501

#501

#5011

#5013

#5019

#5019

#5020

#5023

#5025

#5026

#5027

#5028

#5029

#5030

#5032

#5033

#5034

#5035

#5036

#5037

#5038

#5039

#5042

#5043

#5047

#5048

#5049

#505

#505

#5051

#5053

#5054

#5057

#5060

#5064

#5070

#5071

#5079

#5082

#5084

#5087

#5088

#5090

#5091

#5092

#5093

#5094

#5095

#5096

#5097

#5098

#5099

#5100

#5101

#5102

#5106

#5107

#5108

#5111

#5112

#5118

#5121

#5123

#5124

#5128

#5133

#5139

#5142

#5143

#5146

#5147

#5148

#5149

#5150

#5151

#5154

#5156

#5157

#5158

#5162

#5164

#5165

#5167

#5168

#5170

#5171

#5172

#5175

#5176

#5177

#5178

#5180

#5181

#5182

#5183

#5185

#5186

#5187

#5188

#5190

#5192

#5193

#5194

#5195

#5197

#5198

#5199

#5200

#5201

#5203

#5216

#5221

#5222

#5224

#5225

#5226

#5227

#5228

#523

#523

#5230

#5231

#5232

#5235

#5236

#5239

#524

#524

#5242

#5244

#5247

#5250

#5253

#5254

#5255

#5256

#526

#526

#5260

#5261

#5262

#5266

#527

#527

#5271

#5272

#5273

#5274

#5274

#5276

#5279

#5280

#5283

#5284

#5285

#5286

#5288

#529

#529

#5293

#5293

#5294

#53

#53

#5304

#5305

#5309

#5310

#5310

#5313

#5314

#5314

#5316

#5318

#550

#550

#551

#551

#557

#557

#56

#56

#57

#57

#574

#574

#581

#581

#587

#587

#59

#59

#593

#593

#6

#6

#615

#615

#646

#648

#648

#649

#649

#650

#650

#651

#651

#652

#652

#654

#654

#658

#658

#661

#661

#662

#662

#672

#672

#675

#675

#705

#705

#707

#707

#710

#710

#714

#714

#717

#717

#721

#721

#725

#725

#727

#727

#734

#734

#746

#746

#752

#752

#756

#756

#757

#757

#761

#761

#765

#765

#77

#77

#777

#777

#778

#778

#785

#785

#808

#808

#819

#819

#829

#829

#830

#830

#831

#831

#834

#834

#84

#84

#850

#850

#854

#854

#861

#861

#865

#865

#866

#866

#871

#871

#875

#875

#878

#878

#884

#884

#891

#891

#897

#897

#899

#899

#916

#916

#927

#927

#942

#942

#949

#949

#95

#95

#956

#956

#957

#957

#962

#965

#965

#981

#981

#989

#989

#994

#994

#999

#999

0.8

0.9

1.0

1.1

1.2

1.3

1.4

1.5

1.6

1.7

1.8

1.9

1.9a

2.0

2.1

2.2

2.3

2.4

2.5

2.6

2.7

2.8

2.9

2.9a

3.0

3.0a

3.1

3.1a

3.1b

3.1c

3.2

3.2a

3.3

3.3a

3.4

3.5

3.5a

3.6

3.6a

3.6b

3.7

3.7a

3.7b

Mono Color

• 91ea9e4beb Init. Your Name 2026-06-30 16:34:10 +01:00
• b30f5f82e0 Switch over args stuff. Your Name 2026-06-30 16:30:09 +01:00
• d4eca8d586 Read only bits. Your Name 2026-06-30 15:45:16 +01:00
• 8908f50524 Allow input to be NULL. Nicholas Marriott 2026-06-30 15:42:25 +01:00
• eb2e26f4cd Default command tree bits. Your Name 2026-06-30 15:33:37 +01:00
• 9569c57fc3 Some key bits. Nicholas Marriott 2026-06-30 15:14:54 +01:00
• 90fc51542f Merge branch 'obsd-master' Thomas Adam 2026-06-30 11:30:06 +01:00
• b48e2ea8e9 Handle key binding. Nicholas Marriott 2026-06-30 11:19:52 +01:00
• f8674cc993 Add default features for Ghostty, GitHub issue 5305 from Glib Shpychka. nicm 2026-06-30 10:07:05 +00:00
• f7cd6ab547 No need to escape since logging already does it. Your Name 2026-06-30 10:38:39 +01:00
• 843adbf454 Merge branch 'obsd-master' Thomas Adam 2026-06-30 10:30:06 +01:00
• abefc3f705 Redraw when sync stops again (accidentally turned off), from Japin Li in GitHub issue 5304. nicm 2026-06-30 09:20:43 +00:00
• 401793eba6 Fix indentation. Your Name 2026-06-30 10:06:54 +01:00
• fcfa0b6db4 Allow simple commands to be fired. Your Name 2026-06-30 10:03:49 +01:00
• 5f7a4b0f52 Remove unused arguments. Your Name 2026-06-30 09:47:33 +01:00
• bcc2b7ad1e Remove pointless debug. Your Name 2026-06-30 09:41:23 +01:00
• f9d31962b2 Cleanup work 5211-fix-select-layout-list-windows Michael Grant 2026-06-30 10:40:19 +02:00
• 9e8cf6f0e2 Stub out all users of old API. Your Name 2026-06-30 09:39:45 +01:00
• b8a62979ac Log func also. Your Name 2026-06-30 09:39:34 +01:00
• 45f4000017 Not so much const. Your Name 2026-06-30 09:36:26 +01:00
• 572b32766c Remove old bits. Your Name 2026-06-30 08:43:02 +01:00
• e6ad44c8a3 Fix some errors. Your Name 2026-06-30 08:40:10 +01:00
• 96cd98560b Include Makefile. Nicholas Marriott 2026-06-30 08:34:33 +01:00
• ac23a47a5f Use correct branch for if. Your Name 2026-06-30 08:33:07 +01:00
• 22b6ad6fce Add invoke API. Your Name 2026-06-30 08:24:44 +01:00
• dddd7b44c8 Merge branch 'obsd-master' Thomas Adam 2026-06-30 08:15:06 +01:00
• 25c874c489 Merge branch 'release_3.7a' Nicholas Marriott 2026-06-30 07:46:06 +01:00
• 0e418b62d2 Remove C-r from help. 3.7a Nicholas Marriott 2026-06-30 07:44:51 +01:00
• a97f643bd3 Remove C-r from help since it does not in fact exist. nicm 2026-06-30 06:44:46 +00:00
• 78a2145a47 Update CHANGES. Nicholas Marriott 2026-06-30 07:42:25 +01:00
• dbe50934b1 Add caching of scrollbar options to 3.7a branch. Nicholas Marriott 2026-06-30 07:41:02 +01:00
• efe2453eac New tmux parser and test program. Nicholas Marriott 2026-06-30 07:27:06 +01:00
• 9e0ca948bf Fixed merge errors. Dane Jensen 2026-06-29 15:34:45 -07:00
• 8e070f1a34 Merge branch 'master' into floating_panes Dane Jensen 2026-06-29 15:25:54 -07:00
• 543d104f85 Merge branch 'obsd-master' Thomas Adam 2026-06-29 20:15:07 +01:00
• e06207c914 Cache scrollbar options in window to avoid a slow lookup when working out visible ranges. nicm 2026-06-29 19:03:34 +00:00
• 166267c87a Allow :. in names again, forbidding them is overly pernickety. Only forbid invalid UTF-8 and #(. nicm 2026-06-29 18:17:28 +00:00
• 91e0737b8a Merge branch 'obsd-master' Thomas Adam 2026-06-29 19:30:07 +01:00
• 65a032b205 Allow :. in names again, forbidding them is overly pernickety. Only forbid invalid UTF-8 and #(. nicm 2026-06-29 18:17:28 +00:00
• 80c7dcdbd7 Merge branch 'obsd-master' Thomas Adam 2026-06-29 18:30:06 +01:00
• fbaa3cb565 Merge branch 'master' into 5211-fix-select-layout-list-windows Michael Grant 2026-06-29 19:26:12 +02:00
• bcd54d12d8 Add link=/nolink to styles to specific a hyperlink. GitHub issue 4280 from Moritz Angermann. nicm 2026-06-29 17:08:52 +00:00
• 726e19a886 Merge branch 'obsd-master' Thomas Adam 2026-06-29 18:00:06 +01:00
• 95719e342d Limit hyperlink URIs to 1024 bytes which seems enough and allows us not to have to worry about gigantic URIs in styles, part of a change from Moritz Angermann. nicm 2026-06-29 16:44:06 +00:00
• 132a63d1da Allow empty window and session names. nicm 2026-06-29 16:20:45 +00:00
• 822f700b15 Merge branch 'obsd-master' Thomas Adam 2026-06-29 17:30:06 +01:00
• 5df51a06f5 Allow empty window and session names. nicm 2026-06-29 16:20:45 +00:00
• 64db144425 Update select-layout and list-windows to work with new layouts, floating panes, and use a more modern serialization format. Michael Grant 2026-06-29 17:47:28 +02:00
• ad74c5ed7f Add additional grid consistency checks for macOS. Nicholas Marriott 2026-06-29 10:20:38 +01:00
• d5284be91d Merge branch 'obsd-master' Thomas Adam 2026-06-29 09:00:09 +01:00
• c29b41e527 Make pane scrollbars able to auto-hide after a short timeout. This replaces the previous "modal" behaviour where the pane would be resized, which tended to make a mess. Instead, the scrollbar appears when scrolling or when hovered over with the mouse and disappears a (configurable) short period later. From Michael Grant. nicm 2026-06-29 07:45:09 +00:00
• 4e612612dc Only forbid #( in names and titles (styles are #[ and are useful). nicm 2026-06-28 15:53:18 +00:00
• 705fbf92ee Merge branch 'obsd-master' Thomas Adam 2026-06-28 21:49:05 +01:00
• 2dc704abb6 Always set SIXEL aspect ratio to 1:1, GitHub issue 5291 from James Holderness. Nicholas Marriott 2026-06-28 17:01:52 +01:00
• 6c2ef75681 Bump version. Nicholas Marriott 2026-06-28 16:54:51 +01:00
• 96899dc527 Only forbid #( in names and titles (styles are #[ and are useful). nicm 2026-06-28 15:53:18 +00:00
• b0db912bde Update check-names test. Your Name 2026-06-28 16:52:28 +01:00
• 7cd33ce0dd Set view name immediately when entering mode. nicm 2026-06-27 12:37:36 +00:00
• e0dd40f812 Clear lines before writing in copy mode to avoid leaving stray text when new line is shorter than old. nicm 2026-06-27 12:27:43 +00:00
• 79f0f97495 Make split-window create a new floating pane if used in a floating pane, rather than just complaining. Also improve documentation. From Dane Jensen. nicm 2026-06-27 10:23:14 +00:00
• 5e0b0a2aa3 Pulled code out of layout_split_pane for reuse and added layout_insert_tile. From Dane Jensen. nicm 2026-06-27 10:21:26 +00:00
• e24969b422 Add a helper to swap a node into the place of a leaf, from Dane Jensen. nicm 2026-06-27 10:18:32 +00:00
• dd02989e88 Invalidate scene when changing window Z index, from Dane Jensen. nicm 2026-06-27 10:16:15 +00:00
• 7383c04205 Preseve prompt flags across line clear, from Aung Myo Kyaw. nicm 2026-06-27 10:05:38 +00:00
• 84291b021f Fix check so as to not use NULL name. Nicholas Marriott 2026-06-27 10:58:39 +01:00
• 91e30f4f22 Merge branch 'obsd-master' Thomas Adam 2026-06-26 21:15:06 +01:00
• 5be44a6c03 Use linked sessions not active. nicm 2026-06-26 19:53:47 +00:00
• 8cc20a5618 Merge branch 'obsd-master' Thomas Adam 2026-06-26 19:00:06 +01:00
• 81f88f8517 Add a missing {. 3.7 Nicholas Marriott 2026-06-26 18:55:59 +01:00
• 4eafb27b89 tmux 3.7. Nicholas Marriott 2026-06-26 18:50:58 +01:00
• 4fc4644652 Tweak. Nicholas Marriott 2026-06-26 18:50:42 +01:00
• c0f213b056 Add info modes to tree mode like for clients. nicm 2026-06-26 17:43:15 +00:00
• a2915cfdef Fuzzy test. Nicholas Marriott 2026-06-26 16:09:55 +01:00
• 4b921f3821 Merge branch 'obsd-master' Thomas Adam 2026-06-26 15:56:03 +01:00
• 575f84ce0f Add switch-mode a fast switcher with fuzzy searching, bound to Tab (for windows) or BTab (S-Tab, for sessions) by default. nicm 2026-06-26 14:40:30 +00:00
• 1048796003 Merge branch 'obsd-master' Thomas Adam 2026-06-26 15:15:06 +01:00
• 973c4ab569 Drop mouse movement events rather than redrawing unnecessarily. nicm 2026-06-26 13:58:00 +00:00
• 445677dc00 Merge branch 'obsd-master' Thomas Adam 2026-06-26 14:15:06 +01:00
• da27529d91 Merge branch 'obsd-master' Thomas Adam 2026-06-26 14:00:06 +01:00
• f59921ce18 Use underscore for current in status line. nicm 2026-06-26 12:52:36 +00:00
• ec3c65122f message-command-style should be inverse of message-style. nicm 2026-06-26 12:41:08 +00:00
• 9fa5e81836 Merge branch 'obsd-master' Thomas Adam 2026-06-26 13:15:06 +01:00
• 4869a5165a Add tree-mode-selection-style to continue the process of moving away from mode-style. nicm 2026-06-26 12:06:17 +00:00
• 30e84ff687 Merge branch 'obsd-master' Thomas Adam 2026-06-26 13:00:09 +01:00
• 73fd01c986 Some colour fixes and tweaks (marked pane, cursor colours now work). nicm 2026-06-26 11:36:22 +00:00
• 3729af7438 Merge branch 'obsd-master' Thomas Adam 2026-06-26 12:00:06 +01:00
• 1e5aef279a Update tests for colour/position changes. Nicholas Marriott 2026-06-26 11:32:32 +01:00
• 19db019e0c Do not force theme colours to default when capturing. nicm 2026-06-26 10:29:38 +00:00
• 666464d7a9 Add X11 colours script. Nicholas Marriott 2026-06-26 11:28:15 +01:00
• 391f880d07 Merge branch 'obsd-master' Thomas Adam 2026-06-26 11:15:06 +01:00
• d0bf3bf06d Add ability to float a tiled pane to break-pane, from Dane Jensen. nicm 2026-06-26 10:02:01 +00:00
• edb027e910 Merge branch 'obsd-master' Thomas Adam 2026-06-26 11:00:07 +01:00
• dd2fef6673 Do not count arguments starting - as optional arguments, makes old resize-pane syntax work. GitHub issue 5275, based on a changed from Dane Jensen. nicm 2026-06-26 09:54:56 +00:00
• 8e79c4a03d Bump style buffer to 1024, GitHub issue 5279 from Moritz Angermann. nicm 2026-06-26 09:38:44 +00:00
• 19d70a85fc Merge branch 'obsd-master' Thomas Adam 2026-06-26 09:30:07 +01:00
• f5e9bcc1fc Another couple of bits look nicer in grey. nicm 2026-06-26 08:19:44 +00:00
• 3631f81236 Apply better colours to various builtin bits in modes. nicm 2026-06-26 08:10:48 +00:00
• 1e6f64d5c9 Merge branch 'obsd-master' Thomas Adam 2026-06-26 01:00:06 +01:00
• 569e9d932f Make the default colours more conservative, its really the greys that matter. nicm 2026-06-25 23:48:20 +00:00
• 6a7f4a1894 Merge branch 'obsd-master' Thomas Adam 2026-06-26 00:30:07 +01:00