Martin Weinelt 93f4195fe0 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: - pkgs/applications/graphics/seamly2d/default.nix		2024-07-26 18:05:04 +02:00
..
plugins	treewide: remove trailing space in description	2024-07-26 03:38:50 +02:00
default.nix	Merge remote-tracking branch 'origin/master' into staging-next	2024-07-26 14:31:21 +03:00
Enable-file-access-and-universal-access-for-file-URL.patch	obs-studio: 30.1.2 -> 30.2.0	2024-07-19 12:06:41 -04:00
fix-nix-plugin-path.patch	obs-studio: 30.1.2 -> 30.2.0	2024-07-19 12:06:41 -04:00
wrapper.nix