Final merge fixes

This commit is contained in:
Willy-JL
2024-08-14 02:01:04 +02:00
parent 1a1b3f117a
commit 574304f715
12 changed files with 46 additions and 33 deletions

View File

@@ -3926,8 +3926,12 @@ Variable,+,I_KeyBackspaceSelected_17x11,const Icon,
Variable,+,I_KeyBackspace_17x11,const Icon,
Variable,+,I_KeyKeyboardSelected_10x11,const Icon,
Variable,+,I_KeyKeyboard_10x11,const Icon,
Variable,+,I_KeySaveBlockedSelected_22x11,const Icon,
Variable,+,I_KeySaveBlocked_22x11,const Icon,
Variable,+,I_KeySaveSelected_22x11,const Icon,
Variable,+,I_KeySave_22x11,const Icon,
Variable,+,I_KeySignSelected_21x11,const Icon,
Variable,+,I_KeySign_21x11,const Icon,
Variable,+,I_Keychain_39x36,const Icon,
Variable,+,I_Left_mouse_icon_9x9,const Icon,
Variable,+,I_LoadingHourglass_24x24,const Icon,
1 entry status name type params
3926 Variable + I_KeyBackspace_17x11 const Icon
3927 Variable + I_KeyKeyboardSelected_10x11 const Icon
3928 Variable + I_KeyKeyboard_10x11 const Icon
3929 Variable + I_KeySaveBlockedSelected_22x11 const Icon
3930 Variable + I_KeySaveBlocked_22x11 const Icon
3931 Variable + I_KeySaveSelected_22x11 const Icon
3932 Variable + I_KeySave_22x11 const Icon
3933 Variable + I_KeySignSelected_21x11 const Icon
3934 Variable + I_KeySign_21x11 const Icon
3935 Variable + I_Keychain_39x36 const Icon
3936 Variable + I_Left_mouse_icon_9x9 const Icon
3937 Variable + I_LoadingHourglass_24x24 const Icon