RetroDECK/tools/configurator/res
Rekku ee913e02c5 Merge branch 'cooker' into feat/godot
On branch feat/godot
 All conflicts fixed but you are still merging.

 Changes to be committed:
	modified:   config/retrodeck/reference_lists/features.json
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
2024-09-06 16:15:18 +01:00
..
flags feat/godot configurator (#866) 2024-08-08 16:46:53 +02:00
pixel_ui_theme Merge branch 'cooker' into feat/godot 2024-09-06 16:15:18 +01:00
Rekku feat/godot configurator (#866) 2024-08-08 16:46:53 +02:00
configurator.mp3 feat/godot configurator (#866) 2024-08-08 16:46:53 +02:00
configurator.mp3.import feat/godot configurator (#866) 2024-08-08 16:46:53 +02:00