Morb0 3cb4017c90 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Audio/Announcements/license.txt # Resources/Audio/Effects/Shuttle/licenses.txt # Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml # Resources/Textures/Structures/Storage/tanks.rsi/meta.json		2023-11-14 16:35:33 +03:00
..
AudioTab.xaml	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-05-31 03:26:01 +03:00
AudioTab.xaml.cs	Revert "Update submodule to 175.0.0 (#21318)" (#21319)	2023-10-29 15:29:30 +11:00
GraphicsTab.xaml	LOOC will appear on top of your head (#21514)	2023-11-09 02:18:58 -07:00
GraphicsTab.xaml.cs	LOOC will appear on top of your head (#21514)	2023-11-09 02:18:58 -07:00
KeyRebindTab.xaml	Add scroll zooming for admins and ghosts (#14061)	2023-04-22 04:26:41 -06:00
KeyRebindTab.xaml.cs	Minimalist Action Bar (#21352)	2023-11-13 22:27:14 -05:00
NetworkTab.xaml	Add new PVS options slider (#12146)	2022-10-26 14:19:11 +11:00
NetworkTab.xaml.cs	Fix warnings and code cleanup/fixes (#13570)	2023-01-19 13:56:45 +11:00